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

@@ -137,10 +137,15 @@
 
     /*
      * Main entry point for this test.
      */
     public static void main(String args[]) throws Exception {
+        // reset security properties to make sure that the algorithms
+        // and keys used in this test are not disabled.
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
+        Security.setProperty("jdk.certpath.disabledAlgorithms", "");
+
         if (debug) {
             System.setProperty("javax.net.debug", "all");
         }
 
         String [] protocols = new String [] {

@@ -151,11 +156,16 @@
             /*
              * Run the tests with direct and indirect buffers.
              */
             SSLSocketSSLEngineTemplate test =
                 new SSLSocketSSLEngineTemplate(protocol);
+            log("-------------------------------------");
+            log("Testing " + protocol + " for direct buffers ...");
             test.runTest(true);
+
+            log("---------------------------------------");
+            log("Testing " + protocol + " for indirect buffers ...");
             test.runTest(false);
         }
 
         System.out.println("Test Passed.");
     }

@@ -327,10 +337,14 @@
             // Wait for the client to join up with us.
             if (thread != null) {
                 thread.join();
             }
 
+            if (sslSocket != null) {
+                sslSocket.close();
+            }
+
             if (serverException != null) {
                 if (clientException != null) {
                     serverException.initCause(clientException);
                 }
                 throw serverException;