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

[Andrey Turbanov]

On Mon, 20 Nov 2023 17:46:53 GMT, Joe Wang <jo...@openjdk.org> wrote:

>> Implement the built-in Catalog.
>
> Joe Wang has updated the pull request incrementally with one additional 
> commit since the last revision:
> 
>   add a note; fix alignment

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

> 1029:         if (fStaxEntityResolver != null) {
> 1030:             staxInputSource = fStaxEntityResolver.resolveEntity(ri);
> 1031:         } else if(fEntityResolver != null){

Suggestion:

        } else if (fEntityResolver != null){

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

> 1031:         } else if(fEntityResolver != null){
> 1032:             xmlInputSource = fEntityResolver.resolveEntity(ri);
> 1033:             if(xmlInputSource != null){

Suggestion:

            if (xmlInputSource != null){

test/jaxp/javax/xml/jaxp/unittest/common/catalog/CatalogTestBase.java line 299:

> 297:         Properties config, Properties[] sysProp, Properties[] apiProp, 
> CustomCatalog cc,
> 298:         boolean expectError, String error) throws Exception {
> 299:         testSchema1(filename, xsd, fsp, state, config, sysProp, apiProp, 
> cc, expectError,  error);

Suggestion:

        testSchema1(filename, xsd, fsp, state, config, sysProp, apiProp, cc, 
expectError, error);

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

PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1401651121
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1401651265
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1401651537