cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject cxf git commit: [CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports with JDK8
Date Thu, 25 Jun 2015 12:25:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/master a9a1305a9 -> 0a91c7b36


[CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports with JDK8


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0a91c7b3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0a91c7b3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0a91c7b3

Branch: refs/heads/master
Commit: 0a91c7b3694c8fb453a3eb9c50b94ba4870f8aff
Parents: a9a1305
Author: Alessio Soldano <asoldano@redhat.com>
Authored: Thu Jun 25 14:23:43 2015 +0200
Committer: Alessio Soldano <asoldano@redhat.com>
Committed: Thu Jun 25 14:25:18 2015 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a91c7b3/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 9213e67..e522301 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -625,8 +625,8 @@ public class WSDLGetUtils {
 
         if (imp.getReferencedSchema() != null) {
             for (Map.Entry<String, SchemaReference> e : doneSchemas.entrySet()) {
-                if (e.getValue().getReferencedSchema().getElement()
-                    == imp.getReferencedSchema().getElement()) {
+                if ((e.getValue().getReferencedSchema().getElement() == imp.getReferencedSchema().getElement())
+                    && schemaLocationURI.equals(e.getKey())) {
                     doneSchemas.put(schemaLocationURI, imp);
                     imp.setSchemaLocationURI(e.getKey());
                     return e.getKey();


Mime
View raw message