[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...

[Ron Sigal]

  User: rsigal  
  Date: 07/11/27 22:29:29

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x SocketServerInvoker.java
  Log:
  JBREM-752: Sets ServerSocket's reuseAddress parameter before binding to address.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.17 +6 -3      JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java,v
  retrieving revision 1.30.2.16
  retrieving revision 1.30.2.17
  diff -u -b -r1.30.2.16 -r1.30.2.17
  --- SocketServerInvoker.java	28 Nov 2007 00:59:14 -0000	1.30.2.16
  +++ SocketServerInvoker.java	28 Nov 2007 03:29:29 -0000	1.30.2.17
  @@ -33,6 +33,7 @@
   import javax.net.ssl.SSLException;
   import java.io.IOException;
   import java.net.InetAddress;
  +import java.net.InetSocketAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
   import java.util.HashSet;
  @@ -50,7 +51,7 @@
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.30.2.16 $
  + * @version $Revision: 1.30.2.17 $
    * @jmx:mbean
    */
   public class SocketServerInvoker extends ServerInvoker implements Runnable, SocketServerInvokerMBean
  @@ -143,7 +144,6 @@
            oldServerSocket.close();
            InetAddress bindAddress = InetAddress.getByName(getServerBindAddress());
            ServerSocket newServerSocket = createServerSocket(getServerBindPort(), backlog, bindAddress);
  -         newServerSocket.setReuseAddress(reuseAddress);
            serverSocket = newServerSocket;
            log.info("ServerSocket has been updated");
         }
  @@ -192,7 +192,6 @@
            try
            {
               serverSocket = createServerSocket(getServerBindPort(), backlog, bindAddress);
  -            serverSocket.setReuseAddress(reuseAddress);
            }
            catch(IOException e)
            {
  @@ -262,7 +261,11 @@
                                                int backlog,
                                                InetAddress bindAddress) throws IOException
      {
  -      return getServerSocketFactory().createServerSocket(serverBindPort, backlog, bindAddress);
  +      ServerSocket ss = getServerSocketFactory().createServerSocket();
  +      ss.setReuseAddress(getReuseAddress());
  +      InetSocketAddress address = new InetSocketAddress(bindAddress, serverBindPort);
  +      ss.bind(address, backlog);
  +      return ss;
      }
   
      protected String getThreadName(int i)