-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8362581: Timeouts in java/nio/channels/SocketChannel/OpenLeak.java on UNIX #26478
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
8362581: Timeouts in java/nio/channels/SocketChannel/OpenLeak.java on UNIX #26478
Conversation
👋 Welcome back michaelm! A progress list of the required criteria for merging this PR into |
@Michael-Mc-Mahon 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 3 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
@Michael-Mc-Mahon The following labels 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 lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
/label remove core-libs |
@AlanBateman |
@AlanBateman |
@@ -22,7 +22,7 @@ | |||
*/ | |||
|
|||
/* @test | |||
* @bug 6548464 | |||
* @bug 6548464 8362581 |
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.
I think you can drop this change to the test, it only accidentally uncovered this issue.
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.
This looks good to me. I've verified that with this change, the timing for the test methods in test/jdk/java/nio/channels/SocketChannel/OpenLeak.java
drops back to the same duration that was there before the changes that were done in https://bugs.openjdk.org/browse/JDK-8348986
/integrate |
Going to push as commit de59da2.
Your commit was automatically rebased without conflicts. |
@Michael-Mc-Mahon Pushed as commit de59da2. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Hi,
This is a fix for 8362581 caused by the implementation for https://bugs.openjdk.org/browse/JDK-8348986
An incorrect check was added to the method Exceptions.ioException() which wasn't noticed partly
because that file was renamed, and webrev doesn't show the diffs side by side.
The effect of this change is to restore the method to pretty much what it was before, but taking account
of the changed categorisation of exceptions.
A test is not included since this was caught by an existing regression test.
Thanks,
Michael
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26478/head:pull/26478
$ git checkout pull/26478
Update a local copy of the PR:
$ git checkout pull/26478
$ git pull https://git.openjdk.org/jdk.git pull/26478/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26478
View PR using the GUI difftool:
$ git pr show -t 26478
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26478.diff
Using Webrev
Link to Webrev Comment