7116200: (cs) test/java/nio/charset/coders/StreamTimeout.java fails with "Address already in use"

Reviewed-by: alanb, chegar
Contributed-by: jim.gish@oracle.com, forax@univ-mlv.fr

test/java/nio/charset/coders/StreamTimeout.java

 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,31 +27,32 @@
  *          when the underlying byte stream times out
  */
 
-import java.net.*;
-import java.io.*;
-
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.ServerSocket;
+import java.net.Socket;
 
 public class StreamTimeout {
+    static final PrintStream log = System.err;
+    static String charset = "US-ASCII";
 
-    private static PrintStream log = System.err;
-
-    private static String charset = "US-ASCII";
+    private static class Client extends Thread implements Closeable {
+        private final Socket so;
 
-    private static Object lock = new Object();
-    private static synchronized void waitABit(int millisec) {
-        synchronized(lock) {
-            try {
-                lock.wait(millisec);
-            } catch (InterruptedException e) {
-                //ignore
-            }
-        }
+        Client(int port) throws IOException {
+            so = new Socket("127.0.0.1", port);
         }
 
-    private static class Client extends Thread {
+        @Override
         public void run() {
             try {
-                Socket so = new Socket("127.0.0.1", 22222);
                 Writer wr = new OutputStreamWriter(so.getOutputStream(),
                         charset);
                 wr.write("ab");
@@ -59,9 +60,13 @@ public class StreamTimeout {
             } catch (IOException x) {
                 log.print("Unexpected exception in writer: ");
                 x.printStackTrace();
-                System.exit(1);
             }
         }
+
+        @Override
+        public void close() throws IOException {
+            so.close();
+        }
     }
 
     private static void gobble(InputStream is, Reader rd,
@@ -95,13 +100,16 @@ public class StreamTimeout {
         if (args.length > 0)
             charset = args[0];
 
-        ServerSocket ss = new ServerSocket(22222);
-        Thread cl = new Client();
+        try(ServerSocket ss = new ServerSocket(0);
+            Client cl = new Client(ss.getLocalPort())) {
+
             cl.start();
-        Socket s = ss.accept();
+
+            try(Socket s = ss.accept()) {
                 s.setSoTimeout(150);
-        InputStream is = s.getInputStream();
-        Reader rd = new InputStreamReader(is, charset);
+
+                try(InputStream is = s.getInputStream();
+                    Reader rd = new InputStreamReader(is, charset)) {
 
                     while (is.available() <= 0)
                         Thread.yield();
@@ -131,7 +139,10 @@ public class StreamTimeout {
                     }
                     if (!caught)
                         throw new Exception("Second read completed");
-
+                }
             }
 
+            cl.join();
+        }
+    }
 }