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

8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown #324

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 4, 2024

I backport this for parity with 21.0.4-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8319757 needs maintainer approval

Issue

  • JDK-8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 324

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 2024

👋 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 ace010b38a83e0c9b43aeeb6bc5c92d0886dc53f 8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown Mar 4, 2024
@openjdk
Copy link

openjdk bot commented Mar 4, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 4, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 4, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 4, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 5, 2024

GHA failure: Risc-V compile issue, unrelated.

@openjdk openjdk bot added the approval label Mar 6, 2024
@openjdk
Copy link

openjdk bot commented Mar 7, 2024

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

8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown

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

  • bfaec80: 8325972: Add -x to bash for building with LOG=debug
  • e071843: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • ad1d324: 8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0
  • 930344a: Merge
  • 29bf21f: 8322750: Test "api/java_awt/interactive/SystemTrayTests.html" failed because A blue ball icon is added outside of the system tray
  • 4244cb0: 8306040: HttpResponseInputStream.available() returns 1 on empty stream
  • d6ad625: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 2d62854: 8320343: Generate GIF images for AbstractButton/5049549/bug5049549.java

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated and removed approval labels Mar 7, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

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

  • e7994c1: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
  • 5838aed: 8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to use vm flags
  • 45e20c5: 8311792: java/net/httpclient/ResponsePublisher.java fails intermittently with AssertionError: Found some outstanding operations
  • 2267292: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
  • 47c67bd: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • e328bf3: 8325024: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java incorrect comment information
  • 5c3dfe4: 8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on CentOS Linux release 8.5.2111 and Fedora 27
  • e8d2535: 8315609: Open source few more swing text/html tests
  • 555f824: 8315898: Open source swing JMenu tests
  • bfaec80: 8325972: Add -x to bash for building with LOG=debug
  • ... and 7 more: https://git.openjdk.org/jdk21u-dev/compare/fdbed07d38d4217d209380544d4447ce9b85bad7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 7, 2024

@GoeLin Pushed as commit 0b01feb.

💡 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
1 participant