8253569: javax.xml.catalog.Catalog.matchURI() implementation should reset state variables

[JoeWang-Java]

Resets state of a Catalog instance on each matching call so that it can be reused. Adjusts CatalogResolver's resolve routine so that it continues to observes the PREFER feature in a resolution process. Without the adjustment, PreferFeatureTest would fail.

Mach5 XML tests passed: https://mach5.us.oracle.com/mdash/jobs/huizwang-open-20220329-0148-30563542

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• Change must be properly reviewed

Issue

• JDK-8253569: javax.xml.catalog.Catalog.matchURI() implementation should reset state variables

Reviewers

• Lance Andersen (@LanceAndersen - Reviewer) ⚠️ Review applies to 14513d7
• Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8018/head:pull/8018
$ git checkout pull/8018

Update a local copy of the PR:
$ git checkout pull/8018
$ git pull https://git.openjdk.java.net/jdk pull/8018/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8018

View PR using the GUI difftool:
$ git pr show -t 8018

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8018.diff

[bridgekeeper]

👋 Welcome back joehw! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@JoeWang-Java The following label will be automatically applied to this pull request:

• core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 01: Full - Incremental (16bebbcf)
• 00: Full (14513d7b)

[LanceAndersen]

looks fine Joe

[openjdk]

@JoeWang-Java This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8253569: javax.xml.catalog.Catalog.matchURI() implementation should reset state variables

Reviewed-by: lancea, naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 30 new commits pushed to the master branch:

• 720e751: 8283937: riscv: RVC: Fix c_beqz to c_bnez
• 51c05e8: 8282764: AArch64: compiler/vectorapi/reshape/TestVectorCastNeon.java failed with incorrect result
• b82b009: 8283737: riscv: MacroAssembler::stop() should emit fixed-length instruction sequence
• edb42d7: 8282547: IGV: add control-flow graph view
• 7418373: 8283788: Remove unused VM_DeoptimizeAll::_dependee
• aa33525: 8283787: C1: Remove unused ArrayStoreExceptionStub::_info
• 8b65611: 8283789: CompilerPhaseTypeHelper::to_bitmask should operate on uint64_t
• 9bb916d: 8283800: Simplify String.indexOf/lastIndexOf calls
• b323f54: 8283846: Remove unused jdk.internal.reflect.SignatureIterator
• eb5b712: 8283701: Add final or sealed modifier to appropriate java.awt.color ICC_Profile API classes
• ... and 20 more: https://git.openjdk.java.net/jdk/compare/f01cce235b62e378e91a3bae32942e2f3dfc5c7e...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[naotoj]

Can we eliminate this instance variable, by checking whether the type is Catalog or not in resetOnStart()?

[JoeWang-Java]

Yes, thanks!

[JoeWang-Java]

/integrate

[openjdk]

Going to push as commit eeca3a3.
Since your change was applied there have been 44 commits pushed to the master branch:

• ec0897a: 8281705: SourceLauncherTest.testSystemProperty isn't being run
• 1ddab6f: 8283060: RawNativeLibraries should allow multiple clients to load/unload the same library
• 835c7e8: 8283907: Fix Huawei copyright in various files
• b8dd21b: 8283801: Cleanup confusing String.toString calls
• ce27d9d: 8283494: Factor out calculation of actual number of XMM registers
• e61ccfb: 8283470: Update java.lang.invoke.VarHandle to use sealed classes
• e85fa2f: 8283700: Add final or sealed modifier to appropriate java.awt API classes
• ec9ab55: 8282374: Java_sun_awt_X11_XlibWrapper_XSynchronize is wrong and unused
• a625bfd: 8283903: GetContainerCpuLoad does not return the correct result in share mode
• 97c7298: 8282046: Create a regression test for JDK-8000326
• ... and 34 more: https://git.openjdk.java.net/jdk/compare/f01cce235b62e378e91a3bae32942e2f3dfc5c7e...master

Your commit was automatically rebased without conflicts.

[openjdk]

@JoeWang-Java Pushed as commit eeca3a3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.