cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [09/12] git commit: Simplify expression and make PMD happy
Date Thu, 20 Mar 2014 20:47:02 GMT
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/e9bea234
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9bea234
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9bea234

Branch: refs/heads/2.6.x-fixes
Commit: e9bea2345c8ca007e50ba89c6865effffd20b5f1
Parents: 4bd9a1d
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Mar 20 13:25:25 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Mar 20 16:45:57 2014 -0400

----------------------------------------------------------------------
 rt/core/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/e9bea234/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
----------------------------------------------------------------------
diff --git a/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 0919dfc..c225023 100644
--- a/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/core/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();
                         }
     


Mime
View raw message