8323571: Regression in source resolution process

[JoeWang-Java]

Fix a regression in the source resolution process where it failed to recognize a custom InputSource when both the public and system IDs are null. The particular issue is fixed at line 1233, the rest of the changes is formatting to make the null-check on InputSource the first.

Test is provided by Marc, thanks Marc! (junit-team/junit5#3594)

XML tests, including the new test, pass with this change.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8323571: Regression in source resolution process (Bug - P3)

Reviewers

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

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17377/head:pull/17377
$ git checkout pull/17377

Update a local copy of the PR:
$ git checkout pull/17377
$ git pull https://git.openjdk.org/jdk.git pull/17377/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17377

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17377.diff

Webrev

Link to Webrev Comment

[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 (010c5db8)
• 00: Full (2eb23440)

[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:

8323571: Regression in source resolution process

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 66 new commits pushed to the master branch:

• 93bedd7: 8323213: Fix some javadoc broken links in ObjectReference, and other misc javadoc cleanups
• b78896b: 8319571: Update jni/nullCaller/NullCallerTest.java to accept flags or mark as flagless
• e10d140: 8321712: C2: "failed: Multiple uses of register" in C2_MacroAssembler::vminmax_fp
• c2e77e2: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
• 9fd855e: 8322971: KEM.getInstance() should check if a 3rd-party security provider is signed
• b8ae4a8: 8320890: [AIX] Find a better way to mimic dl handle equality
• e5aed6b: 8323276: StressDirListings.java fails on AIX
• b922f8d: 8319793: C2 compilation fails with "Bad graph detected in build_loop_late" after JDK-8279888
• 35e9662: 8314515: java/util/concurrent/SynchronousQueue/Fairness.java failed with "Error: fair=false i=8 j=0"
• cb1d25f: 8323330: [BACKOUT] JDK-8276809: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java shows JNI warning on Windows
• ... and 56 more: https://git.openjdk.org/jdk/compare/ca9635df3357bf70b41645f619237b6d2068afb7...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]

LGTM. If the file was modified this year, put 2024 in the header

[JoeWang-Java]

LGTM. If the file was modified this year, put 2024 in the header

Copyright year fixed. Thanks.

[JoeWang-Java]

/integrate

[openjdk]

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

• 49e6121: 8310813: Simplify and modernize equals, hashCode, and compareTo for BigInteger
• 4ea7b36: 8322235: Split up and improve LocaleProvidersRun
• 93bedd7: 8323213: Fix some javadoc broken links in ObjectReference, and other misc javadoc cleanups
• b78896b: 8319571: Update jni/nullCaller/NullCallerTest.java to accept flags or mark as flagless
• e10d140: 8321712: C2: "failed: Multiple uses of register" in C2_MacroAssembler::vminmax_fp
• c2e77e2: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
• 9fd855e: 8322971: KEM.getInstance() should check if a 3rd-party security provider is signed
• b8ae4a8: 8320890: [AIX] Find a better way to mimic dl handle equality
• e5aed6b: 8323276: StressDirListings.java fails on AIX
• b922f8d: 8319793: C2 compilation fails with "Bad graph detected in build_loop_late" after JDK-8279888
• ... and 58 more: https://git.openjdk.org/jdk/compare/ca9635df3357bf70b41645f619237b6d2068afb7...master

Your commit was automatically rebased without conflicts.

[openjdk]

@JoeWang-Java Pushed as commit e4389d8.

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