svn commit: r1412478 - /river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java

[peter_firmstone]

Author: peter_firmstone
Date: Thu Nov 22 10:12:50 2012
New Revision: 1412478

URL: http://svn.apache.org/viewvc?rev=1412478&view=rev
Log:
Remove temporary debugging hacks.

Modified:
    river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java

Modified: river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
URL: 
http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java?rev=1412478&r1=1412477&r2=1412478&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Thu Nov 22 
10:12:50 2012
@@ -2578,16 +2578,8 @@ class RegistrarImpl implements Registrar
                 try {
                     listen = createServerSocket(serverSocketFactory, port);
                 }catch ( BindException ex){
-                    try {
-                        Thread.sleep(240000); // Wait 4 minutes for TCP 2MSL 
TIME_WAIT
-                        listen = createServerSocket(serverSocketFactory, port);
-                    }catch (BindException e){
-                        e.fillInStackTrace();
-                        throw new IOException("Reggie ServerSocket port 
already in use: " + port, e);
-                    }catch (InterruptedException e){
-                        e.fillInStackTrace();
-                        throw new IOException("Reggie ServerSocket creation 
interrupted after sleeping for TIME_WAIT", e);
-                    }
+                    ex.fillInStackTrace();
+                    throw new IOException("Reggie ServerSocket port already in 
use: " + port, ex);
                 }
            }
            this.port = listen.getLocalPort();