Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk16u Public archive

8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl #94

Closed
wants to merge 2 commits into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Mar 26, 2021


Progress

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

Issue

  • JDK-8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 94

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2021

👋 Welcome back clanger! 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 63f8fc87cdf3edb828474bb4954b76721ba8f9e5 8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl Mar 26, 2021
@openjdk
Copy link

openjdk bot commented Mar 26, 2021

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

@openjdk openjdk bot added the backport label Mar 26, 2021
Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In SSLSocketImpl.java, lines 1480-1484 are replaced by a single line 1488, but the original patch doesn't do that. SSLTransport.java needs a copyright update to 2021. Otherwise, lgtm.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 1, 2021
@RealCLanger
Copy link
Contributor Author

In SSLSocketImpl.java, lines 1480-1484 are replaced by a single line 1488, but the original patch doesn't do that. SSLTransport.java needs a copyright update to 2021. Otherwise, lgtm.

OK, the change l 1480-1484 comes from https://bugs.openjdk.java.net/browse/JDK-8253635 which in itself probably makes sense to backport as well. But I took it out for this BP.

I updated copyright years for both, SSLTransport and SSLSocketImpl.

@mlbridge
Copy link

mlbridge bot commented Apr 1, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 1, 2021

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

8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl

Reviewed-by: phh

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

  • 31940f1: 8263311: Watch registry changes for remote printers update instead of polling
  • 3464a0f: 8261916: gtest/GTestWrapper.java vmErrorTest.unimplemented1_vm_assert failed
  • 72be1e2: 8259627: Potential memory leaks in JVMTI after JDK-8227745
  • e99595b: 8263564: Consolidate POSIX code for runtime exit support: os::shutdown, os::abort and os::die
  • 566703a: 8261262: Kitchensink24HStress.java crashed with EXCEPTION_ACCESS_VIOLATION
  • 484087b: 8258753: StartTlsResponse.close() hangs due to synchronization issues

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 the ready Pull request is ready to be integrated label Apr 1, 2021
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Apr 1, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 1, 2021
@openjdk
Copy link

openjdk bot commented Apr 1, 2021

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

  • 31940f1: 8263311: Watch registry changes for remote printers update instead of polling
  • 3464a0f: 8261916: gtest/GTestWrapper.java vmErrorTest.unimplemented1_vm_assert failed
  • 72be1e2: 8259627: Potential memory leaks in JVMTI after JDK-8227745
  • e99595b: 8263564: Consolidate POSIX code for runtime exit support: os::shutdown, os::abort and os::die
  • 566703a: 8261262: Kitchensink24HStress.java crashed with EXCEPTION_ACCESS_VIOLATION
  • 484087b: 8258753: StartTlsResponse.close() hangs due to synchronization issues

Your commit was automatically rebased without conflicts.

Pushed as commit 27c8449.

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

@RealCLanger RealCLanger deleted the 8259662 branch April 14, 2021 22:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants