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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/12 17:49:24

  Modified:    src/main/org/jboss/remoting/transport/sslbisocket 
                        SSLBisocketClientInvoker.java
  Log:
  JBREM-642, JBREM-657:  createSocket() (1) sets reuse address correctly, and (2) checks for per invocation timeout.
  
  Revision  Changes    Path
  1.4       +18 -7     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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SSLBisocketClientInvoker.java	16 Jan 2007 09:19:15 -0000	1.3
  +++ SSLBisocketClientInvoker.java	12 Mar 2007 21:49:24 -0000	1.4
  @@ -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;
   
  @@ -104,20 +105,30 @@
   
      
      
  -   protected Socket createSocket(String address, int port) throws IOException
  +   protected Socket createSocket(String address, int port, int timeout) throws IOException
      {
  -      log.info("listenerId: " + listenerId);
  -      if (listenerId != null)
  -         return super.createSocket(address, port);
  +      if (isCallbackInvoker)
  +         return super.createSocket(address, port, timeout);
         
         SocketFactory sf = getSocketFactory();
   
         if (sf == null)
            sf = createSocketFactory(configuration);
   
  -      Socket s = sf.createSocket(address, port);
  -log.info("socket factory: " + sf);
  -log.info("socket: " + s);
  +      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