commit a1025d0535372bf2511b76380fc7ed2f3988a9e2
author Artem Smotrakov <asmotrak@openjdk.org> Mon Jun 20 17:06:27 2016 -0700
committer Artem Smotrakov <asmotrak@openjdk.org> Mon Jun 20 17:06:27 2016 -0700
tree 98cb84bef596fd75495433ea8beedb9535dd0320
parent bc0e20636ea1eb7ec0b66ecb149ee4716a7e85f4

8049314: javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java fails intermittently with "Unexpected EOF" message

Reviewed-by: xuelei

jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java

diff --git a/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
index fd5ec86..091ed4d 100644
--- a/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
+++ b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -178,8 +178,11 @@
 
         char[] passphrase = "passphrase".toCharArray();
 
-        ks.load(new FileInputStream(keyFilename), passphrase);
-        ts.load(new FileInputStream(trustFilename), passphrase);
+        try (FileInputStream keyFile = new FileInputStream(keyFilename);
+                FileInputStream trustFile = new FileInputStream(trustFilename)) {
+            ks.load(keyFile, passphrase);
+            ts.load(trustFile, passphrase);
+        }
 
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
         kmf.init(ks, passphrase);
@@ -310,6 +313,7 @@
                             if (retry &&
                                     serverIn.remaining() < clientMsg.length) {
                                 log("Need to read more from client");
+                                serverIn.compact();
                                 retry = false;
                                 continue;
                             } else {