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

8264048: Fix caching in Jar URL connections when an entry is missing #3263

Closed
wants to merge 3 commits into from

Conversation

AlekseiEfimov
Copy link
Member

@AlekseiEfimov AlekseiEfimov commented Mar 30, 2021

Current fix tries to tackle an issue with URL connection referencing non-existing Jar file entries:
If an entry that doesn't exist is specified in an URL connection the underlying Jar file is still cached even if an exception is thrown after that. Such behavior prevents the caller, for instance, a URLClassLoader, from closing a Jar file.

The proposed fix checks if entry exists before caching a Jar file (only for cases with enabled caching):

  • If entry exists - jar file is cached if it wasn't cached before
  • If entry doesn't exist and jar file wasn't cached before - jar file is closed and exception is thrown
  • If entry doesn't exist and jar file was cached before - jar file is kept cached and exception is thrown

The following tests have been used to verify the fix:

  • New regression tests
  • :jdk_core: tests
  • api/java_util,api/java_net JCK tests

Progress

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

Issue

  • JDK-8264048: Fix caching in Jar URL connections when an entry is missing

Reviewers

Contributors

  • Daniel Fuchs <dfuchs@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3263

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 30, 2021

👋 Welcome back aefimov! 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 label Mar 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

@AlekseiEfimov The following labels will be automatically applied to this pull request:

  • core-libs
  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs net labels Mar 30, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 30, 2021

Webrevs

@dfuch
Copy link
Member

@dfuch dfuch commented Mar 31, 2021

Hi Aleksei, thanks for putting this together.

test/jdk/sun/misc/URLClassPath/RemoveJar.java seems to be an older version of test/jdk/java/net/URLClassLoader/RemoveJar.java. The two tests are almost identical - so test/jdk/sun/misc/URLClassPath/RemoveJar.java can probably be removed from the PR.

Otherwise the proposed changes look good to me.

@AlekseiEfimov
Copy link
Member Author

@AlekseiEfimov AlekseiEfimov commented Mar 31, 2021

Thanks for the review, Daniel. It is correct that test/jdk/sun/misc/URLClassPath/RemoveJar.java is an old version. It is removed now.

Copy link
Member

@bchristi-git bchristi-git left a comment

Hi, Aleksei. The change looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2021

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

8264048: Fix caching in Jar URL connections when an entry is missing

Co-authored-by: Daniel Fuchs <dfuchs@openjdk.org>
Reviewed-by: bchristi, dfuchs

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

  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • 8132548: 8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested
  • ec7b002: 8264626: C1 should be able to inline excluded methods
  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • b1a225e: 8263565: NPE was thrown when sun.jvm.hotspot.rmi.serverNamePrefix was set
  • c41cd15: 8264686: ClhsdbTestConnectArgument.java should use SATestUtils::validateSADebugDPrivileges
  • b7baca7: 8264288: Performance issue with MethodHandle.asCollector
  • ... and 77 more: https://git.openjdk.java.net/jdk/compare/f3726a87007f2ec40ff961824f6efe99862284d8...master

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 Mar 31, 2021
dfuch
dfuch approved these changes Apr 1, 2021
@AlekseiEfimov
Copy link
Member Author

@AlekseiEfimov AlekseiEfimov commented Apr 6, 2021

/contributor add dfuchs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

@AlekseiEfimov
Contributor Daniel Fuchs <dfuchs@openjdk.org> successfully added.

@AlekseiEfimov
Copy link
Member Author

@AlekseiEfimov AlekseiEfimov commented Apr 6, 2021

/integrate

@openjdk openjdk bot closed this Apr 6, 2021
@openjdk openjdk bot added integrated and removed ready labels Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

@AlekseiEfimov Since your change was applied there have been 88 commits pushed to the master branch:

  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • 8132548: 8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested
  • ec7b002: 8264626: C1 should be able to inline excluded methods
  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • b1a225e: 8263565: NPE was thrown when sun.jvm.hotspot.rmi.serverNamePrefix was set
  • c41cd15: 8264686: ClhsdbTestConnectArgument.java should use SATestUtils::validateSADebugDPrivileges
  • ... and 78 more: https://git.openjdk.java.net/jdk/compare/f3726a87007f2ec40ff961824f6efe99862284d8...master

Your commit was automatically rebased without conflicts.

Pushed as commit a611c46.

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

@openjdk openjdk bot removed the rfr label Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated net
3 participants