-
Notifications
You must be signed in to change notification settings - Fork 6k
8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342
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
Conversation
👋 Welcome back lancea! A progress list of the required criteria for merging this PR into |
@LanceAndersen The following label will be automatically applied to this pull request:
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. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
return buffer.toByteArray(); | ||
} | ||
|
||
/** |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left-over?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the quick review Claes!
I was going to remove this method but chose to leave it in to make it a bit more straight forward to port to JDK 8 (which I have run the test on as well). No strong preferences, just figured leaving it there might make it slightly easier for a back port.
@LanceAndersen 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:
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 200 new commits pushed to the
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 |
/integrate |
Going to push as commit b85500e.
Your commit was automatically rebased without conflicts. |
@LanceAndersen Pushed as commit b85500e. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Hi all,
This patch addresses a regression introduced in JDK 15 via JDK-8242959 where you can no longer access a file entry contained within a Zip file when there is also a directory entry with the same name via ZipFile:getEntry().
Once fixed, the behavior will be consistent with earlier JDK releases.
Mach5 tiers 1-3 have been run without failure
Best
Lance
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6342/head:pull/6342
$ git checkout pull/6342
Update a local copy of the PR:
$ git checkout pull/6342
$ git pull https://git.openjdk.java.net/jdk pull/6342/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 6342
View PR using the GUI difftool:
$ git pr show -t 6342
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6342.diff