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

[Tom Elrod]

  User: telrod  
  Date: 06/09/20 00:22:24

  Modified:    src/main/org/jboss/remoting/transport/socket  
                        MicroSocketClientInvoker.java
                        SocketClientInvoker.java
  Log:
  JBREM-596 - fix for leasing problem when have multiple clients using same client invoker.  Basically moved all lease managment for clients into the client invokers themselves.
  
  Revision  Changes    Path
  1.15      +9 -5      JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- MicroSocketClientInvoker.java	23 Aug 2006 03:57:37 -0000	1.14
  +++ MicroSocketClientInvoker.java	20 Sep 2006 04:22:24 -0000	1.15
  @@ -1,5 +1,6 @@
   package org.jboss.remoting.transport.socket;
   
  +import org.jboss.logging.Logger;
   import org.jboss.remoting.CannotConnectException;
   import org.jboss.remoting.ConnectionFailedException;
   import org.jboss.remoting.InvokerLocator;
  @@ -30,10 +31,13 @@
    *
    * @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.14 $
  + * @version $Revision: 1.15 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  +   private static final Logger log = Logger.getLogger(MicroSocketClientInvoker.class);
  +   private static final boolean isTraceEnabled = log.isTraceEnabled();
  +
      protected InetAddress addr;
      protected int port;
   
  @@ -413,7 +417,7 @@
            }
            else
            {
  -            if (log.isTraceEnabled())
  +            if (isTraceEnabled)
               {
                  log.trace("Pool was already full, will close the connection");
               }
  @@ -428,7 +432,7 @@
         }
   
         // Return response
  -      if (log.isTraceEnabled())
  +      if (isTraceEnabled)
         {
            log.trace("Response: " + response);
         }
  @@ -674,7 +678,7 @@
                  Socket socket = null;
                  try
                  {
  -                  if (log.isTraceEnabled())
  +                  if (isTraceEnabled)
                     {
                        log.trace("Creating socket number " + (counter++));
                     }
  @@ -770,7 +774,7 @@
            }
            catch (Exception ex)
            {
  -            if (log.isTraceEnabled())
  +            if (isTraceEnabled)
               {
                  log.trace("Couldn't reuse connection from pool");
               }
  
  
  
  1.38      +6 -2      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.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- SocketClientInvoker.java	5 Jul 2006 16:51:54 -0000	1.37
  +++ SocketClientInvoker.java	20 Sep 2006 04:22:24 -0000	1.38
  @@ -22,6 +22,7 @@
   
   package org.jboss.remoting.transport.socket;
   
  +import org.jboss.logging.Logger;
   import org.jboss.remoting.InvokerLocator;
   
   import javax.net.SocketFactory;
  @@ -38,10 +39,13 @@
    *
    * @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.37 $
  + * @version $Revision: 1.38 $
    */
   public class SocketClientInvoker extends MicroSocketClientInvoker
   {
  +   private static final Logger log = Logger.getLogger(SocketClientInvoker.class);
  +   private static final boolean isTraceEnabled = log.isTraceEnabled();
  +   
      public static final String SO_TIMEOUT_FLAG = "timeout";
   
      /**
  @@ -217,7 +221,7 @@
            }
            catch (Exception ex)
            {
  -            if (log.isTraceEnabled())
  +            if (isTraceEnabled)
               {
                  log.trace("Couldn't reuse connection from pool");
               }