Searched entities on system catalog as last resort

Author: rmraya

lib/xmljava.jar

@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.MessageFormat;
+import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -261,7 +262,6 @@ private List<String[]> getUriRewrites() {
         return uriRewrites;
     }
 
-    @SuppressWarnings("resource")
     @Override
     public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
         if (publicId != null) {
@@ -333,6 +333,14 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
         if (dtdSystemEntities != null && systemId != null && dtdSystemEntities.containsKey(systemId)) {
             return new InputSource(new FileInputStream(dtdSystemEntities.get(systemId)));
         }
+        Collection<String> values = systemCatalog.values();
+        Iterator<String> it = values.iterator();
+        while (it.hasNext()) {
+            String value = it.next();
+            if (value.endsWith(systemId)) {
+                return new InputSource(new FileInputStream(value));
+            }
+        }
         return null;
     }
 

src/com/maxprograms/xml/Catalog.java

@@ -15,7 +15,7 @@
 public class Constants {
 
     public static final String VERSION = "2.1.1";
-    public static final String BUILD = "20250217_1831";
+    public static final String BUILD = "20250221_1014";
 
     private Constants() {
         // private for security