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

8259572: [test] Fix SSL tests after JDK-8237578 to properly handle SocketExceptions #2029

Closed
wants to merge 1 commit into from

Conversation

simonis
Copy link
Member

@simonis simonis commented Jan 11, 2021

JDK-8237578 exposes some SocketExceptions directly which were previously wrapped inside an SSLException. The change updated one test to take this new behaviour into account (i.e. TrustTrustedCert.java) but apparently missed other tests.

The fix for the other tests is similar like the fix for TrustTrustedCert.java in JDK-8237578:

- } catch (SSLException ssle) {
+ } catch (SSLException | SocketException se) {
             if (!expectFail) {
-                throw ssle;
+                throw se;
             } // Otherwise, ignore.
         } 

Progress

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

Issue

  • JDK-8259572: [test] Fix SSL tests after JDK-8237578 to properly handle SocketExceptions

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2029/head:pull/2029
$ git checkout pull/2029

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2021

👋 Welcome back simonis! 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 added the rfr Pull request is ready for review label Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@simonis The following labels will be automatically applied to this pull request:

  • net
  • security

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.

@openjdk openjdk bot added security security-dev@openjdk.org net net-dev@openjdk.org labels Jan 11, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 11, 2021

Webrevs

@simonis simonis closed this Jan 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
net net-dev@openjdk.org rfr Pull request is ready for review security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

1 participant