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

8193682: Infinite loop in ZipOutputStream.close() #914

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 18, 2022

I backport this for parity with 11.0.16-oracle.

It does not apply because "8267587: Update java.util to use enhanced switch"
is not in 11. I removed the new switch constructs from the code.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed
  • Change requires a CSR request to be approved

Issues

  • JDK-8193682: Infinite loop in ZipOutputStream.close()
  • JDK-8276305: Infinite loop in ZipOutputStream.close() (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 914

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2022

👋 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 1e9ed54d362b8c57be5fbbac2de5afbd0f05435f 8193682: Infinite loop in ZipOutputStream.close() Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

@openjdk openjdk bot added backport rfr labels Mar 18, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 18, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

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

8193682: Infinite loop in ZipOutputStream.close()

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 22, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

  • 79c45a5: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 31d7b5e: 8222926: Shenandoah build fails with --with-jvm-features=-compiler1
  • 7c29f0e: 8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps
  • 03da67b: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 9714b69: 8206330: Revisit com/sun/jdi/RedefineCrossEvent.java
  • d568fc8: 8283420: [AOT] Exclude TrackedFlagTest/NotTrackedFlagTest in 11u because of intermittent java.lang.AssertionError: duplicate classes for name Ljava/lang/Boolean;
  • bb54eeb: 8209883: ZGC: Compile without C1 broken
  • 6e5000f: 8283424: compiler/loopopts/LoopUnswitchingBadNodeBudget.java fails with release VMs due to lack of -XX:+UnlockDiagnosticVMOptions
  • cf52a6f: 8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream
  • f14b932: 8246494: introduce vm.flagless at-requires property
  • ... and 11 more: https://git.openjdk.java.net/jdk11u-dev/compare/dbd14f7b2c023200e6d8c9ec3a7a8f07a3ea9613...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 22, 2022
@openjdk openjdk bot closed this Mar 22, 2022
@openjdk openjdk bot removed ready rfr labels Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

@GoeLin Pushed as commit b0d7b5a.

💡 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_8193682 branch Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants