test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java

@@ -101,10 +101,12 @@
                 checkSuccess(rc4_ciphersuites);
                 break;
             default:
                 throw new RuntimeException("Wrong parameter: " + args[0]);
         }
+
+        System.out.println("Test passed");
     }
 
     /*
      * Checks if that specified cipher suites cannot be used.
      */

@@ -125,11 +127,10 @@
                     System.out.println("Expected exception on client side: "
                             + e);
                 }
             }
 
-            server.stop();
             while (server.isRunning()) {
                 sleep();
             }
 
             if (!server.sslError()) {

@@ -221,15 +222,23 @@
                     out.flush();
                     socket.getSession().invalidate();
                 } catch (SSLHandshakeException e) {
                     System.out.println("Server: run: " + e);
                     sslError = true;
+                    stopped = true;
                 } catch (IOException e) {
                     if (!stopped) {
-                        System.out.println("Server: run: " + e);
+                        System.out.println("Server: run: unexpected exception: "
+                                + e);
                         e.printStackTrace();
                         otherError = true;
+                        stopped = true;
+                    } else {
+                        System.out.println("Server: run: " + e);
+                        System.out.println("The exception above occurred "
+                                    + "because socket was closed, "
+                                    + "please ignore it");
                     }
                 }
             }
 
             System.out.println("Server: finished");

@@ -258,10 +267,11 @@
 
         void stop() {
             stopped = true;
             if (!ssocket.isClosed()) {
                 try {
+                    System.out.println("Server: close socket");
                     ssocket.close();
                 } catch (IOException e) {
                     System.out.println("Server: close: " + e);
                 }
             }