[jboss-remoting-commits] JBoss Remoting SVN: r5141 - remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2009-05-06 00:28:37 -0400 (Wed, 06 May 2009)
New Revision: 5141

Modified:
   remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
Log:
JBREM-1112 (and others to be named): establishLease() goes on to call Client.addConnectionListener() if there is an existing leasePinger..

Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-06 04:26:49 UTC (rev 5140)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-06 04:28:37 UTC (rev 5141)
@@ -344,12 +344,12 @@
    {
       synchronized(clientLeaseLock)
       {
-          log.debug(this + " entering terminateLease()");
          if (passedLeasePinger != null && passedLeasePinger != leasePinger)
          {
             log.debug(this + ": " + passedLeasePinger + " != " + leasePinger);
             return;
          }
+         log.debug(this + " entering terminateLease() for " + leasePinger);
          if(leasePinger != null)
          {
             leasePinger.setDisconnectTimeout(disconnectTimeout);
@@ -394,6 +394,7 @@
          {
             log.debug(this + " leasePinger is null: must have been shut down already");
          }
+         log.debug(this + " leaving terminateLease() for " + leasePinger);
       }
    }
 
@@ -424,9 +425,9 @@
          {
             leasePinger.addClient(clientSessionID, configuration, leasePeriod);
             log.debug(this + " added client with session ID " + clientSessionID + " to " + leasePinger);
-            return;
          }
-
+         else
+         {
          try
          {
             if(trace) { log.trace(this + " sending initial lease ping to server to determine if server has leasing enabled."); }
@@ -478,6 +479,7 @@
             e.initCause(throwable);
             throw e;
          }
+         }
 //         finally
          {
 //             Client client = (Client) configuration.get(Client.CLIENT);