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

8273826: Correct Manifest file name and NPE checks #503

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 9, 2021

I backport this for parity with 11.0.14-oracle.

I had to do a few minor adaptions:

Resolve JarFile.java due to context.

Fix the test to run in the jdk11u environment.
Also, I changed an argument to newFileSystem() form
Collections.emptyMap() to null. This factory method
internally uses emptyMap(), so the result is the same.


Progress

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

Issue

  • JDK-8273826: Correct Manifest file name and NPE checks

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/503/head:pull/503
$ git checkout pull/503

Update a local copy of the PR:
$ git checkout pull/503
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/503/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 503

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/503.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 9, 2021

👋 Welcome back goetz! 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 changed the title Backport 03a8d342b86e720d3cba08d540182b4ab161fba3 8273826: Correct Manifest file name and NPE checks Oct 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 9, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr labels Oct 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 9, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Your resolution makes sense to me.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

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

8273826: Correct Manifest file name and NPE checks

Reviewed-by: mdoerr

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

  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting
  • 75b513f: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 84fc3b7: 8211148: var in implicit lambdas shouldn't be accepted for source < 11
  • 65cab1e: 8198616: java/awt/Focus/6378278/InputVerifierTest.java fails on mac

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 the ready label Oct 11, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Oct 11, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

  • bcee700: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character
  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting
  • 75b513f: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 84fc3b7: 8211148: var in implicit lambdas shouldn't be accepted for source < 11
  • 65cab1e: 8198616: java/awt/Focus/6378278/InputVerifierTest.java fails on mac

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

@GoeLin Pushed as commit 9512c47.

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

@GoeLin GoeLin deleted the goetz_backport_8273826 branch Oct 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants