< prev index next >

src/java.xml/share/classes/javax/xml/catalog/Util.java

Print this page

        

*** 53,62 **** --- 53,65 ---- * publicId is specified. * * prefer "public": attempts to resolve with a system entry; * attempts to resolve with a public entry if no matching * system entry is found. + * + * If no match is found, continue searching uri entries + * * @param catalog the catalog * @param publicId the publicId * @param systemId the systemId * @return the resolved systemId if a match is found, null otherwise */
*** 75,84 **** --- 78,91 ---- if (resolvedSystemId == null && publicId != null) { resolvedSystemId = catalog.matchPublic(publicId); } + if (resolvedSystemId == null && systemId != null) { + resolvedSystemId = catalog.matchURI(systemId); + } + //mark the catalog as having been searched before trying alternatives catalog.markAsSearched(); //search alternative catalogs if (resolvedSystemId == null) {
< prev index next >