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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/22 23:10:17

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_2_0_GA MicroSocketClientInvoker.java
  Log:
  JBREM-771:  Merging changes from branch remoting_2_2_2_experimental: when disconnecting, clears connection pool referenced by instance variable "pool".
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.26.2.4 +7 -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.16.2.26.2.3
  retrieving revision 1.16.2.26.2.4
  diff -u -b -r1.16.2.26.2.3 -r1.16.2.26.2.4
  --- MicroSocketClientInvoker.java	29 Jul 2007 05:36:16 -0000	1.16.2.26.2.3
  +++ MicroSocketClientInvoker.java	23 Aug 2007 03:10:17 -0000	1.16.2.26.2.4
  @@ -38,7 +38,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.16.2.26.2.3 $
  + * @version $Revision: 1.16.2.26.2.4 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -113,11 +113,10 @@
      /**
       * Close all sockets in a specific pool.
       */
  -   public static void clearPool(ServerAddress sa)
  +   public static void clearPool(LinkedList thepool)
      {
         try
         {
  -         LinkedList thepool = (LinkedList)connectionPools.get(sa);
            if (thepool == null)
            {
               return;
  @@ -157,7 +156,7 @@
               ServerAddress sa = (ServerAddress) i.next();
   
               if (trace) { log.trace("clearing pool for " + sa); }
  -            clearPool(sa);
  +            clearPool((LinkedList) connectionPools.get(sa));
               i.remove();
            }
         }
  @@ -419,7 +418,6 @@
            }
         }
   
  -      
         val = params.get(SocketServerInvoker.CHECK_CONNECTION_KEY);
         if (val != null && ((String)val).length() > 0)
         {
  @@ -453,6 +451,7 @@
      protected synchronized void handleDisconnect()
      {
         clearPools();
  +      clearPool(pool);
      }
   
      /**
  @@ -527,6 +526,9 @@
            }
            catch (Exception e)
            {
  +//            if (bailOut)
  +//               return null;
  +            
               throw new CannotConnectException(
                  "Can not get connection to server. Problem establishing " +
                  "socket connection for " + locator, e);