Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1cfdfbb28 -> 8312517ac
[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/1bec0324 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1bec0324 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1bec0324 Branch: refs/heads/3.0.x-fixes Commit: 1bec032480a2dbe6c2ba7b6c4c8d2b99d1fad257 Parents: 1cfdfbb Author: Alessio Soldano <[email protected]> Authored: Thu Jun 25 14:23:43 2015 +0200 Committer: Alessio Soldano <[email protected]> Committed: Thu Jun 25 16:07:53 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/1bec0324/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();
