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

8254350: CompletableFuture.get may swallow InterruptedException #1964

Closed

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Jun 20, 2023

I backport this for parity with 11.0.20-oracle.
src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
Resolved due to context
test/jdk/java/util/concurrent/CompletableFuture/LostInterrupt.java
Resolved due to context
test/jdk/java/util/concurrent/CompletableFuture/SwallowedInterruptedException.java
Resolved due to context


Progress

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

Issue

  • JDK-8254350: CompletableFuture.get may swallow InterruptedException (Bug - P3)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/1964/head:pull/1964
$ git checkout pull/1964

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1964

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1964.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 20, 2023

👋 Welcome back luchenlin! 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 43dc3f79923a70306eaf91f77392b7dbb99f1fd1 8254350: CompletableFuture.get may swallow InterruptedException Jun 20, 2023
@openjdk
Copy link

openjdk bot commented Jun 20, 2023

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

@openjdk
Copy link

openjdk bot commented Jun 20, 2023

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

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

8254350: CompletableFuture.get may swallow InterruptedException

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

  • 6e12eba: Merge
  • d286dde: 8303465: KeyStore of type KeychainStore, provider Apple does not show all trusted certificates
  • 20fe22f: 8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
  • e6aba91: 8229333: java/io/File/SetLastModified.java timed out
  • defa0b2: 8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow
  • 4452721: 8229338: clean up test/jdk/java/util/RandomAccess/Basic.java
  • 273987b: 8231357: sun/security/pkcs11/Cipher/TestKATForGCM.java fails on SLES11 using mozilla-nss-3.14
  • 0eb4503: 8231037: java/net/InetAddress/ptr/Lookup.java fails intermittently due to reverse lookup failed
  • dda5ed2: 8226221: Update PKCS11 tests to use NSS 3.46 libs
  • ade9973: 8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface
  • ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/2cc45963906f088a56aad599a58e2842a214de7b...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 20, 2023

Webrevs

@luchenlin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 22, 2023
@openjdk
Copy link

openjdk bot commented Jun 22, 2023

@luchenlin
Your change (at version 5dce635) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jun 25, 2023

/inetgrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2023

@GoeLin Unknown command inetgrate - for a list of valid commands use /help.

@GoeLin
Copy link
Member

GoeLin commented Jun 26, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

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

  • cc88f4c: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 4dd85cb: 8297587: Upgrade JLine to 3.22.0
  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • ... and 17 more: https://git.openjdk.org/jdk11u-dev/compare/2cc45963906f088a56aad599a58e2842a214de7b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 26, 2023

@GoeLin @luchenlin Pushed as commit 5506ecf.

💡 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
backport clean integrated Pull request has been integrated
2 participants