cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject [1/2] cxf git commit: [CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports with JDK8
Date Thu, 25 Jun 2015 16:17:24 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 4d453da45 -> bdb066bee


[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/9a4d1fe6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9a4d1fe6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9a4d1fe6

Branch: refs/heads/2.7.x-fixes
Commit: 9a4d1fe635291331ef554922079b44d380117f85
Parents: 4d453da
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 18:12:06 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/9a4d1fe6/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 1826598..bab0a60 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
@@ -626,8 +626,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