8321406: Null IDs should be resolved as before catalogs are added

Reviewed-by: naoto, iris, lancea

Author: JoeWang-Java

src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java

@@ -1038,7 +1038,8 @@ public StaxXMLInputSource resolveEntityAsPerStax(XMLResourceIdentifier resourceI
         }
 
         // Step 2: custom catalog if specified
-        if (staxInputSource == null && (fUseCatalog && fCatalogFile != null)) {
+        if ((publicId != null || literalSystemId != null) &&
+                staxInputSource == null && (fUseCatalog && fCatalogFile != null)) {
             if (fCatalogResolver == null) {
                 fCatalogFeatures = JdkXmlUtils.getCatalogFeatures(fDefer, fCatalogFile, fPrefer, fResolve);
                 fCatalogResolver = CatalogManager.catalogResolver(fCatalogFeatures);
@@ -1048,18 +1049,21 @@ public StaxXMLInputSource resolveEntityAsPerStax(XMLResourceIdentifier resourceI
         }
 
         // Step 3: use the default JDK Catalog Resolver if Step 2's resolve is continue
-        if (staxInputSource == null && JdkXmlUtils.isResolveContinue(fCatalogFeatures)) {
+        if ((publicId != null || literalSystemId != null) &&
+                staxInputSource == null && JdkXmlUtils.isResolveContinue(fCatalogFeatures)) {
             initJdkCatalogResolver();
 
             staxInputSource = resolveWithCatalogStAX(fDefCR, JdkCatalog.JDKCATALOG, publicId, literalSystemId);
         }
 
         // Step 4: default resolution if not resolved by a resolver and the RESOLVE
         // feature is set to 'continue'
+        // Note if both publicId and systemId are null, the resolution process continues as usual
         if (staxInputSource != null) {
             fISCreatedByResolver = true;
-        } else if (JdkXmlUtils.isResolveContinue(fCatalogFeatures) &&
-                fSecurityManager.is(Limit.JDKCATALOG_RESOLVE, JdkConstants.CONTINUE)) {
+        } else if ((publicId == null && literalSystemId == null) ||
+                (JdkXmlUtils.isResolveContinue(fCatalogFeatures) &&
+                fSecurityManager.is(Limit.JDKCATALOG_RESOLVE, JdkConstants.CONTINUE))) {
             staxInputSource = new StaxXMLInputSource(
                     new XMLInputSource(publicId, literalSystemId, baseSystemId, true), false);
         }
@@ -1222,8 +1226,10 @@ public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) th
 
         // Step 4: default resolution if not resolved by a resolver and the RESOLVE
         // feature is set to 'continue'
-        if ((xmlInputSource == null) && JdkXmlUtils.isResolveContinue(fCatalogFeatures) &&
-                fSecurityManager.is(Limit.JDKCATALOG_RESOLVE, JdkConstants.CONTINUE)) {
+        // Note if both publicId and systemId are null, the resolution process continues as usual
+        if ((publicId == null && literalSystemId == null) ||
+                ((xmlInputSource == null) && JdkXmlUtils.isResolveContinue(fCatalogFeatures) &&
+                fSecurityManager.is(Limit.JDKCATALOG_RESOLVE, JdkConstants.CONTINUE))) {
             xmlInputSource = new XMLInputSource(publicId, literalSystemId, baseSystemId, false);
         }