commit 8a80a56dd78af0aa969f927490ca50eafc566e92
author Lukas Jungmann <lukas.jungmann@oracle.com> Wed Mar 23 16:24:12 2022 +0100
committer Lukas Jungmann <lukas.jungmann@oracle.com> Wed Mar 23 16:54:16 2022 +0100
tree d4763d2812d426381de8c2cc9162ef1e1973a0de
parent 909ca5fac6413a2d21df9612dbab58c6ccf98c6a

#1499: xjc - NGCCRuntimeEx.resolveRelativeURL(String namespaceURI, String relativeUri ) doesn't work as it should

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java

diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java
index 6a23beb..759c6a6 100644
--- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java
+++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java
@@ -10,17 +10,17 @@
 
 package com.sun.xml.xsom.impl.parser;
 
+import com.sun.tools.rngdatatype.ValidationContext;
 import com.sun.xml.xsom.XSDeclaration;
-import com.sun.xml.xsom.XmlString;
 import com.sun.xml.xsom.XSSimpleType;
+import com.sun.xml.xsom.XmlString;
+import com.sun.xml.xsom.impl.Const;
 import com.sun.xml.xsom.impl.ForeignAttributesImpl;
 import com.sun.xml.xsom.impl.SchemaImpl;
 import com.sun.xml.xsom.impl.UName;
-import com.sun.xml.xsom.impl.Const;
 import com.sun.xml.xsom.impl.parser.state.NGCCRuntime;
 import com.sun.xml.xsom.impl.parser.state.Schema;
 import com.sun.xml.xsom.parser.AnnotationParser;
-import com.sun.tools.rngdatatype.ValidationContext;
 import org.xml.sax.Attributes;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
@@ -123,12 +123,12 @@
     }
 
     public static boolean ignorableDuplicateComponent(XSDeclaration c) {
-        if(c.getTargetNamespace().equals(Const.schemaNamespace)) {
-            if(c instanceof XSSimpleType)
+        if(Const.schemaNamespace.equals(c.getTargetNamespace())) {
+            if(c instanceof XSSimpleType) {
                 // hide artificial "double definitions" on simple types
                 return true;
-            if(c.isGlobal() && c.getName().equals("anyType"))
-                return true; // ditto for anyType
+            }
+            return c.isGlobal() && "anyType".equals(c.getName()); // ditto for anyType
         }
         return false;
     }
@@ -180,11 +180,11 @@
             if (relativeUri!=null) {
                 if (isAbsolute(relativeUri)) {
                     systemId = relativeUri;
-                }
-                if (baseUri == null || !isAbsolute(baseUri)) {
+                } else if (baseUri == null || !isAbsolute(baseUri)) {
                     throw new IOException("Unable to resolve relative URI " + relativeUri + " because base URI is not absolute: " + baseUri);
+                } else {
+                    systemId = new URL(new URL(baseUri), relativeUri).toString();
                 }
-                systemId = new URL(new URL(baseUri), relativeUri).toString();
             }
 
             if (er!=null) {
@@ -618,7 +618,4 @@
 
         return impl;
     }
-
-
-    public static final String XMLSchemaNSURI = "http://www.w3.org/2001/XMLSchema";
 }