RFR: 8306055: Add a built-in Catalog to JDK XML module [v2]

Lance Andersen lancea at openjdk.org
Mon Nov 20 16:51:27 UTC 2023


On Sun, 19 Nov 2023 23:36:16 GMT, Joe Wang <joehw at openjdk.org> wrote:

>> Implement the built-in Catalog.
>
> Joe Wang has updated the pull request incrementally with one additional commit since the last revision:
> 
>   remove J2SE directory; add note explaining how DTDs are resolved

Hi Joe,

Thank you for all of your hard work and perseverance to drive this project as I realize it was a lot of work and iterations based on feedback from the team.

Overall looks good.  A couple of minor comments below

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

> 1082:             String publicId, String systemId) {
> 1083:         InputSource is = resolveWithCatalog(cr, cFile, publicId, systemId);
> 1084: //        if (is != null && !is.isEmpty()) {

Probably can delete this

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

> 1099:                 return cr.resolveEntity(publicId, systemId);
> 1100:             } catch (CatalogException e) {
> 1101:                 fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"CatalogException",

Alignment looks like it needs to be sanity checked here

-------------

PR Review: https://git.openjdk.org/jdk/pull/16719#pullrequestreview-1739611943
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1399080861
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1399081930


More information about the core-libs-dev mailing list