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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/03 00:18:46

  Modified:    src/main/org/jboss/remoting/transport/socket 
                        SocketClientInvoker.java
  Log:
  JBREM-690: Calls checkOpenConnection if socket wrapper implements OpenConnectionChecker.
  
  Revision  Changes    Path
  1.40      +15 -7     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.39
  retrieving revision 1.40
  diff -u -b -r1.39 -r1.40
  --- SocketClientInvoker.java	12 Jan 2007 18:56:22 -0000	1.39
  +++ SocketClientInvoker.java	3 Feb 2007 05:18:46 -0000	1.40
  @@ -40,7 +40,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.39 $
  + * @version $Revision: 1.40 $
    */
   public class SocketClientInvoker extends MicroSocketClientInvoker
   {
  @@ -62,13 +62,11 @@
       * Set number of retries in getSocket method
       */
      public SocketClientInvoker(InvokerLocator locator)
  -         throws IOException
      {
         this(locator, null);
      }
   
      public SocketClientInvoker(InvokerLocator locator, Map configuration)
  -         throws IOException
      {
         super(locator, configuration);
         configureParameters();
  @@ -92,13 +90,13 @@
            {
               try
               {
  -               int nVal = Integer.valueOf((String) val).intValue();
  -               timeout = nVal;
  -               log.debug("Setting SocketClientInvoker::timeout to: " + timeout);
  +               timeout = Integer.valueOf((String) val).intValue();;
  +               log.debug(this + " setting timeout to " + timeout);
               }
               catch (Exception e)
               {
  -               log.warn("Could not convert " + SO_TIMEOUT_FLAG + " value of " + val + " to a int value.");
  +               log.warn(this + " could not convert " + SO_TIMEOUT_FLAG + " value of " +
  +                        val + " to a int value.");
               }
            }
         }
  @@ -185,6 +183,10 @@
            {
               if (socketWrapper != null)
               {
  +               if (socketWrapper instanceof OpenConnectionChecker)
  +               {
  +                  ((OpenConnectionChecker) socketWrapper).checkOpenConnection();
  +               }
                  if (shouldCheckConnection)
                  {
                     socketWrapper.checkConnection();
  @@ -238,4 +240,10 @@
      {
         return timeout;
      }
  +
  +   public String toString()
  +   {
  +      return "SocketClientInvoker[" + Integer.toHexString(hashCode()) + ", " +
  +         locator.getProtocol() + "://" + locator.getHost() + ":" + locator.getPort() + "]";
  +   }
   }