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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/12 17:45:28

  Modified:    src/main/org/jboss/remoting/transport/sslsocket  Tag:
                        remoting_2_x SSLSocketClientInvoker.java
  Log:
  JBREM-657:  createSocket() checks for per invocation timeout.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.4   +9 -1      JBossRemoting/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java,v
  retrieving revision 1.3.2.3
  retrieving revision 1.3.2.4
  diff -u -b -r1.3.2.3 -r1.3.2.4
  --- SSLSocketClientInvoker.java	21 Feb 2007 10:42:39 -0000	1.3.2.3
  +++ SSLSocketClientInvoker.java	12 Mar 2007 21:45:28 -0000	1.3.2.4
  @@ -117,7 +117,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);
   
         if (s instanceof SSLSocket)
         {