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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/08 01:44:22

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_2_0_GA
                        MicroRemoteClientInvoker.java
  Log:
  JBREM-783: In terminateLease() catch exceptions from LeasePinger.disconnectClient().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.14.4.4 +13 -11    JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroRemoteClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java,v
  retrieving revision 1.7.2.14.4.3
  retrieving revision 1.7.2.14.4.4
  diff -u -b -r1.7.2.14.4.3 -r1.7.2.14.4.4
  --- MicroRemoteClientInvoker.java	8 Aug 2007 00:13:52 -0000	1.7.2.14.4.3
  +++ MicroRemoteClientInvoker.java	8 Aug 2007 05:44:22 -0000	1.7.2.14.4.4
  @@ -27,7 +27,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.7.2.14.4.3 $
  + * @version $Revision: 1.7.2.14.4.4 $
    */
   public abstract class MicroRemoteClientInvoker extends AbstractInvoker implements ClientInvoker
   {
  @@ -348,19 +348,21 @@
         {
            if (isLastClientLease)
            {
  +            localPinger.stopPing();
  +         }
  +         
               try
               {
  -               localPinger.stopPing();
  +            localPinger.setDisconnectTimeout(disconnectTimeout);
  +            localPinger.disconnectClient(sessionId);
               }
               catch (Exception e)
               {
  +            // The only exception thrown by LeasePinger.disconnectClient()
  +            // is a RuntimeException thrown by LeasePinger.disconnect().
                  log.error("error shutting down lease pinger");
               }
            }
  -         
  -         localPinger.setDisconnectTimeout(disconnectTimeout);
  -         localPinger.disconnectClient(sessionId);
  -      }
      }
   
      public long getLeasePeriod(String sessionID)