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

[Tom Elrod]

  User: telrod  
  Date: 07/02/14 16:17:41

  Modified:    src/main/org/jboss/remoting/transport/socket   Tag:
                        remoting_2_x MicroSocketClientInvoker.java
                        SocketClientInvoker.java
  Log:
  JBREM-642 - fixing so reuse address gets set correctly
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.22 +14 -6     JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.16.2.21
  retrieving revision 1.16.2.22
  diff -u -b -r1.16.2.21 -r1.16.2.22
  --- MicroSocketClientInvoker.java	3 Feb 2007 02:11:54 -0000	1.16.2.21
  +++ MicroSocketClientInvoker.java	14 Feb 2007 21:17:41 -0000	1.16.2.22
  @@ -20,6 +20,7 @@
   import java.net.InetAddress;
   import java.net.Socket;
   import java.net.SocketException;
  +import java.net.InetSocketAddress;
   import java.rmi.MarshalException;
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -35,7 +36,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.16.2.21 $
  + * @version $Revision: 1.16.2.22 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -677,7 +678,11 @@
            {
               pool = new LinkedList();
               connectionPools.put(address, pool);
  -            log.debug(this + " added new pool as " + address);
  +            log.debug(this + " added new pool (" + pool + ") as " + address);
  +         }
  +         else
  +         {
  +            log.debug(this + " using pool (" + pool + ") already defined for " + address);
            }
         }
      }
  @@ -745,7 +750,6 @@
                     throw ex;
                  }
                  socket.setTcpNoDelay(address.enableTcpNoDelay);
  -               socket.setReuseAddress(reuseAddress);
   
                  Map metadata = getLocator().getParameters();
                  if (metadata == null)
  @@ -806,7 +810,11 @@
   
      protected Socket createSocket(String address, int port) throws IOException
      {
  -      return new Socket(address, port);
  +      Socket s = new Socket();
  +      s.setReuseAddress(getReuseAddress());
  +      InetSocketAddress inetAddr = new InetSocketAddress(address, port);      
  +      s.connect(inetAddr);
  +      return s;
      }
   
      protected SocketWrapper getPooledConnection()
  
  
  
  1.38.2.7  +11 -3     JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java,v
  retrieving revision 1.38.2.6
  retrieving revision 1.38.2.7
  diff -u -b -r1.38.2.6 -r1.38.2.7
  --- SocketClientInvoker.java	3 Feb 2007 22:19:55 -0000	1.38.2.6
  +++ SocketClientInvoker.java	14 Feb 2007 21:17:41 -0000	1.38.2.7
  @@ -31,6 +31,7 @@
   import java.lang.reflect.Constructor;
   import java.net.Socket;
   import java.net.SocketTimeoutException;
  +import java.net.InetSocketAddress;
   import java.rmi.MarshalException;
   import java.util.Map;
   
  @@ -40,7 +41,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.38.2.6 $
  + * @version $Revision: 1.38.2.7 $
    */
   public class SocketClientInvoker extends MicroSocketClientInvoker
   {
  @@ -162,15 +163,22 @@
   
      protected Socket createSocket(String address, int port) throws IOException
      {
  +      Socket s = null;
         SocketFactory socketFactory = getSocketFactory();
         if (socketFactory != null)
         {
  -         return socketFactory.createSocket(address, port);
  +         s = socketFactory.createSocket();
         }
         else
         {
  -         return new Socket(address, port);
  +          s = new Socket();
         }
  +
  +      s.setReuseAddress(getReuseAddress());
  +      InetSocketAddress inetAddr = new InetSocketAddress(address, port);
  +      s.connect(inetAddr, getTimeout());
  +
  +      return s;
      }
   
      protected SocketWrapper getPooledConnection()