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

8299835: (jrtfs) Unnecessary null check in JrtPath.getAttributes #11911

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Jan 9, 2023

jdk.internal.jrtfs.JrtFileSystem#getFileAttributes never return null

JrtFileAttributes getFileAttributes(JrtPath path, LinkOption... options)
throws IOException {
Node node = checkNode(path);
if (node.isLink() && followLinks(options)) {
return new JrtFileAttributes(node.resolveLink(true));
}
return new JrtFileAttributes(node);
}

So, no need to check for null its result.
Seems it was copied from ZipPath (name of variable suggests that) - https://github.com/openjdk/jdk/blob/master/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java#L769. But for ZipFileSystem null is expected.


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-8299835: (jrtfs) Unnecessary null check in JrtPath.getAttributes

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11911

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

Using diff file

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

Sorry, something went wrong.

@turbanoff turbanoff changed the title [PATCH] Unnecessary null check in JrtPath.getAttributes 8299835: (jrtfs) Unnecessary null check in JrtPath.getAttributes Jan 9, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2023

👋 Welcome back aturbanov! 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 Jan 9, 2023
@openjdk
Copy link

openjdk bot commented Jan 9, 2023

@turbanoff 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 Jan 9, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2023

Webrevs

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

This looks okay as the 2-arg getFileAttrbutes will throw if the entry doesn't exist in the file system. I assume you'll update the end copyright year to 2023 before you integrate this.

@openjdk
Copy link

openjdk bot commented Jan 10, 2023

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

8299835: (jrtfs) Unnecessary null check in JrtPath.getAttributes

Reviewed-by: alanb, lancea

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 31 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 Jan 10, 2023
@turbanoff
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 11, 2023

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

  • 7d3400b: 8299864: ZipFileStore#supportsFileAttributeView(String) doesn't throw NPE
  • d15285f: 8299956: [BACKOUT] 8297487: G1 Remark: no need to keep alive oop constants of nmethods on stack
  • 5a9490a: 8299853: Serial: Use more concrete type for TenuredGeneration::_the_space
  • f857f8a: 8299327: Allow super late barrier expansion of store barriers in C2
  • 257f667: 8296789: -completion in jshell fails to expose synthetic bridge methods
  • 030e88d: 8299829: In jshell, the output of "0".repeat(49999)+"2" ends with a '0'
  • ef32fdb: 8284825: sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java failed with "RuntimeException: Processed unnecessary paint()."
  • 95b102c: 8299309: Test "java/awt/Dialog/ModalDialogTest/ModalDialogTest.java" fails because new frame was not displayed when "New Frame" button was clicked
  • f312c99: 8299482: Remove metaprogramming/isIntegral.hpp
  • 10a747c: 8299479: Remove metaprogramming/decay.hpp
  • ... and 38 more: https://git.openjdk.org/jdk/compare/d53cac379419b7b74df045bb119df6d5f9e91878...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 11, 2023

@turbanoff Pushed as commit 4cd87f1.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

3 participants