stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8265297: javax/net/ssl/SSLSession/TestEnabledProtocols.java failed with "RuntimeException: java.net.SocketException: Connection reset"

Browse Source 
Reviewed-by: xuelei, rhalade
This commit is contained in:
Fernando Guallini 2021-06-17 16:23:56 +00:00 committed by Rajan Halade
parent 091bc4a1a6
commit 2047da7dcc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/jdk/javax/net/ssl/SSLSession/TestEnabledProtocols.java
View File

@ -38,6 +38,7 @@
* @author Ram Marti * @author Ram Marti
*/ */
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -136,13 +137,13 @@ public class TestEnabledProtocols extends SSLSocketTemplate {
e.printStackTrace(System.out); e.printStackTrace(System.out);
System.out.println("** Success **"); System.out.println("** Success **");
} }
} catch (SSLException ssle) { } catch (SSLException | SocketException se) {
// The server side may have closed the socket. // The server side may have closed the socket.
if (isConnectionReset(ssle)) { if (isConnectionReset(se)) {
System.out.println("Client SSLException:"); System.out.println("Client SocketException:");
ssle.printStackTrace(System.out); se.printStackTrace(System.out);
} else { } else {
failTest(ssle, "Client got UNEXPECTED SSLException:"); failTest(se, "Client got UNEXPECTED Exception:");
} }
} catch (Exception e) { } catch (Exception e) {
@ -150,8 +151,8 @@ public class TestEnabledProtocols extends SSLSocketTemplate {
} }
} }
private boolean isConnectionReset(SSLException ssle) { private boolean isConnectionReset(IOException ioe) {
Throwable cause = ssle.getCause(); Throwable cause = ioe instanceof SSLException se ? se.getCause() : ioe;
return cause instanceof SocketException return cause instanceof SocketException
&& "Connection reset".equals(cause.getMessage()); && "Connection reset".equals(cause.getMessage());
} }