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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/12 17:44:56

  Modified:    src/main/org/jboss/remoting/transport/sslbisocket  Tag:
                        remoting_2_x SSLBisocketClientInvoker.java
  Log:
  JBREM-642, JBREM-657:  createSocket() (1) sets reuse address correctly, and (2) check for per invocation timeout.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +15 -1     JBossRemoting/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLBisocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -b -r1.1.2.5 -r1.1.2.6
  --- SSLBisocketClientInvoker.java	21 Feb 2007 10:39:10 -0000	1.1.2.5
  +++ SSLBisocketClientInvoker.java	12 Mar 2007 21:44:56 -0000	1.1.2.6
  @@ -23,6 +23,7 @@
   package org.jboss.remoting.transport.sslbisocket;
   
   import java.io.IOException;
  +import java.net.InetSocketAddress;
   import java.net.Socket;
   import java.util.Map;
   
  @@ -114,7 +115,20 @@
         if (sf == null)
            sf = createSocketFactory(configuration);
   
  -      Socket s = sf.createSocket(address, port);
  +      Socket s = sf.createSocket();
  +
  +      s.setReuseAddress(getReuseAddress());
  +      InetSocketAddress inetAddr = new InetSocketAddress(address, port);
  +      
  +      if (timeout < 0)
  +      {
  +         timeout = getTimeout();
  +         if (timeout < 0)
  +            timeout = 0;
  +      }
  +      
  +      s.connect(inetAddr, timeout);
  +      
         if (s instanceof SSLSocket)
         {
            // need to check for handshake listener and add them if there is one