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

7903151: NPE when resolving @library from jtreg plugin #70

Closed
wants to merge 3 commits into from

Conversation

mcimadamore
Copy link
Contributor

@mcimadamore mcimadamore commented Apr 8, 2022

This patch fixes a trivial NPE which occurs when the plugin is attempting to resolve an absolute library in a @library tag. If no library is found starting from TEST.ROOT, and if TEST.ROOT does not specify any alternate library root, the plugin fails with a NPE, as the code is eagerly trimming the property value "external.lib.roots", which might not exist.

The solution is simple, e.g. check for null before trimming.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 70

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 8, 2022

👋 Welcome back mcimadamore! 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.

@@ -26,6 +26,7 @@ dependencies {

// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
version = '2021.3.3'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change to the build was necessary as the 1.0 of the IntelliJ gradle plugin seems to have an issue when working with the latest IntelliJ EAP (which the build downloads so that it can build against it). This problem is documented here:

https://youtrack.jetbrains.com/issue/IDEA-291192

The solution would be to update to plugin version 1.5.2 - but that plugin version still requires an intellij version to be specified manually. I found that by specify the current IntelliJ version as the IntelliJ API we wanna build against, things work just fine, even with the 1.0 plugin.

@openjdk
Copy link

openjdk bot commented Apr 8, 2022

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

7903151: NPE when resolving @library from jtreg plugin

Reviewed-by: djelinski, jjg

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

  • c415cd0: 7903168: Update openjdk/jtreg repo to require 1 Reviewer
  • 7966ad0: 7903171: Fix issues related to generating internal API documentation
  • e7a8de6: 7903055: Replace junit.jar with junit-platform-console-standalone artifact
  • dec2a59: 7903159: Make jtreg self-tests run on Windows/Cygwin
  • b498d9e: 7903155: replace single use of rsync with cp -R
  • 266576a: 7903152: On macOS, avoid using /usr/bin/tidy
  • ff5d2b9: 7903150: Restructure generated files for jtreg self-tests
  • 1433968: 7903097: jtreg could implement ToolProvider

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 8, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 8, 2022

Webrevs

@@ -26,6 +26,7 @@ dependencies {

// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
version = '2021.3.3'
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
version = '2021.3.3'
version = project.findProperty('intellijVersion') ?: '2021.3.3'

while at it, you could also update the docs on intellijVersion here

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 28, 2022
Copy link
Member

@djelinski djelinski left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 28, 2022
@mcimadamore
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 28, 2022

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

  • c415cd0: 7903168: Update openjdk/jtreg repo to require 1 Reviewer
  • 7966ad0: 7903171: Fix issues related to generating internal API documentation
  • e7a8de6: 7903055: Replace junit.jar with junit-platform-console-standalone artifact
  • dec2a59: 7903159: Make jtreg self-tests run on Windows/Cygwin
  • b498d9e: 7903155: replace single use of rsync with cp -R
  • 266576a: 7903152: On macOS, avoid using /usr/bin/tidy
  • ff5d2b9: 7903150: Restructure generated files for jtreg self-tests
  • 1433968: 7903097: jtreg could implement ToolProvider

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 28, 2022

@mcimadamore Pushed as commit bc75e5f.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants