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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/21 04:42:34

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x SocketClientInvoker.java
  Log:
  JBREM-598, JBREM-657: Added timeout parameter to createSocket().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.38.2.8  +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.7
  retrieving revision 1.38.2.8
  diff -u -b -r1.38.2.7 -r1.38.2.8
  --- SocketClientInvoker.java	14 Feb 2007 21:17:41 -0000	1.38.2.7
  +++ SocketClientInvoker.java	21 Feb 2007 09:42:34 -0000	1.38.2.8
  @@ -41,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.7 $
  + * @version $Revision: 1.38.2.8 $
    */
   public class SocketClientInvoker extends MicroSocketClientInvoker
   {
  @@ -161,7 +161,7 @@
      }
   
   
  -   protected Socket createSocket(String address, int port) throws IOException
  +   protected Socket createSocket(String address, int port, int timeout) throws IOException
      {
         Socket s = null;
         SocketFactory socketFactory = getSocketFactory();
  @@ -176,7 +176,15 @@
   
         s.setReuseAddress(getReuseAddress());
         InetSocketAddress inetAddr = new InetSocketAddress(address, port);
  -      s.connect(inetAddr, getTimeout());
  +      
  +      if (timeout < 0)
  +      {
  +         timeout = getTimeout();
  +         if (timeout < 0)
  +            timeout = 0;
  +      }
  +      
  +      s.connect(inetAddr, timeout);
   
         return s;
      }