Repository: cxf Updated Branches: refs/heads/master 3c2824e05 -> 9c18083ec
Simplify expression and make PMD happy Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c18083e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c18083e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c18083e Branch: refs/heads/master Commit: 9c18083ec68a06a239104e58e497cb9bb5f745b4 Parents: 3c2824e Author: Daniel Kulp <[email protected]> Authored: Thu Mar 20 13:25:25 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Thu Mar 20 13:25:25 2014 -0400 ---------------------------------------------------------------------- rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9c18083e/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java index 0919dfc..c225023 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java @@ -71,7 +71,7 @@ public final class SchemaUtil { List<Definition> defList = new ArrayList<Definition>(); parseImports(def, defList); extractSchema(def, schemaCol, schemas); - // added + // added getSchemaList(def); Map<Definition, Definition> done = new IdentityHashMap<Definition, Definition>(); @@ -127,9 +127,8 @@ public final class SchemaUtil { if (def.getDocumentBaseURI() != null && def.getDocumentBaseURI().toUpperCase().endsWith(".xsd") && def.getTargetNamespace() == null - && (obj == null - || !(obj instanceof Schema - || !((Schema)obj).getDocumentBaseURI().equals(def.getDocumentBaseURI())))) { + && obj instanceof Schema + && ((Schema)obj).getDocumentBaseURI().equals(def.getDocumentBaseURI())) { systemId = def.getDocumentBaseURI(); }
