Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8326915: NPE when a validating parser is restricted #18071

Closed
wants to merge 2 commits into from

Conversation

JoeWang-Java
Copy link
Member

@JoeWang-Java JoeWang-Java commented Feb 29, 2024

Fix a NPE when a validating parser is restricted by the JDKCatalog resolve property. Also slightly improved the error msg with the catalog name.

Test: new test added
existing test CatalogSupport5 would fail without the Null check on ErrorReporter. It's a separate issue not covered by this fix.


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-8326915: NPE when a validating parser is restricted (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18071

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 29, 2024

👋 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 openjdk bot added the rfr Pull request is ready for review label Feb 29, 2024
@openjdk
Copy link

openjdk bot commented Feb 29, 2024

@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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 29, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 29, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 1, 2024

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

8326915: NPE when a validating parser is restricted

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

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 1, 2024
Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

if (i > 0) {
return uri.substring(i+1, uri.length());
return input.substring(i+1, input.length());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the second argument is not needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Fixed. Also replaced the test's method name with a proper name.

@JoeWang-Java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 2, 2024

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

  • f62f2ad: 8325671: Shenandoah: Introduce a ShenandoahGenerationType and templatize certain marking closures with it
  • f68a4b9: 8327105: compiler.compilercontrol.share.scenario.Executor should listen on loopback address only
  • a9c17a2: 8327108: compiler.lib.ir_framework.shared.TestFrameworkSocket should listen on loopback address only
  • 7f02f07: 8316708: Augment WorstCaseTests with more cases
  • 8f0fb27: 8327136: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java fails on libgraal
  • b38a6c5: 8327049: Only export debug.cpp functions on Windows
  • acc0a74: 8327126: Parallel: Remove unused ParMarkBitMapClosure::_initial_words_remaining
  • 012411a: 8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order
  • 98434d6: 8322170: Update deprecated/obsolete/expired flags table for GC
  • c02e7f4: 8327058: RISC-V: make Zcb experimental
  • ... and 10 more: https://git.openjdk.org/jdk/compare/742c776a922bc226a3beaa9e219ff0bd2baf7bc4...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 2, 2024
@openjdk openjdk bot closed this Mar 2, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 2, 2024
@openjdk
Copy link

openjdk bot commented Mar 2, 2024

@JoeWang-Java Pushed as commit a3d51d2.

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

@JoeWang-Java JoeWang-Java deleted the JDK-8326915 branch April 17, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants