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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/27 04:08:03

  Modified:    src/main/org/jboss/remoting/transport/multiplex 
                        MultiplexClientInvoker.java
  Log:
  JBREM-657, JBREM-701: Added test for timeout < 0 in createSocket().
  
  Revision  Changes    Path
  1.45      +8 -1      JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexClientInvoker.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- MultiplexClientInvoker.java	22 Oct 2006 06:47:08 -0000	1.44
  +++ MultiplexClientInvoker.java	27 Mar 2007 08:08:03 -0000	1.45
  @@ -484,10 +484,17 @@
      }
   
   
  -   protected Socket createSocket(String address, int port) throws IOException
  +   protected Socket createSocket(String address, int port, int timeout) throws IOException
      {
         log.debug("MultiplexClientInvoker.createSocket()");
   
  +      if (timeout < 0)
  +      {
  +         timeout = getTimeout();
  +         if (timeout < 0)
  +            timeout = 0;
  +      }
  +
         // If connection has been broken, try to connect to new server.
         if (socketGroupInfo != null && socketGroupInfo.getPrimingSocket() != null)
         {