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

[Tom Elrod]

  User: telrod  
  Date: 06/09/27 14:23:27

  Modified:    src/main/org/jboss/remoting   Tag: remoting_1_4 Lease.java
                        ServerInvoker.java
  Log:
  JBREM-606 - update version to 1.4.5.GA
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +8 -2      JBossRemoting/src/main/org/jboss/remoting/Lease.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lease.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Lease.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- Lease.java	22 Mar 2006 06:34:02 -0000	1.4
  +++ Lease.java	27 Sep 2006 18:23:27 -0000	1.4.2.1
  @@ -52,10 +52,12 @@
      private LeaseTimerTask leaseTimerTask = null;
      private long leaseWindow = -1;
      private long pingStart = -1;
  +   private Map clientLeases = null;
   
      private boolean leaseUpdated = false;
   
  -   public Lease(String clientSessionId, long leasePeriod, String locatorurl, Map requestPayload, ConnectionNotifier notifier)
  +   public Lease(String clientSessionId, long leasePeriod, String locatorurl, Map requestPayload,
  +                ConnectionNotifier notifier, Map clientLeases)
      {
         this.clientSessionId = clientSessionId;
         this.leasePeriod = leasePeriod;
  @@ -63,6 +65,7 @@
         this.locatorURL = locatorurl;
         this.requestPayload = requestPayload;
         this.leaseWindow = leasePeriod;
  +      this.clientLeases = clientLeases;
         leaseTimer = new TimerQueue("Lease-" + clientSessionId);
      }
   
  @@ -131,8 +134,11 @@
               {
                  stopLease();
                  notifier.connectionLost(locatorURL, clientSessionId, requestPayload);
  +               if(clientLeases != null)
  +               {
  +                  clientLeases.remove(clientSessionId);
               }
            }
         }
      }
  -}
  \ No newline at end of file
  +}}
  \ No newline at end of file
  
  
  
  1.28.2.1  +5 -3      JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -b -r1.28 -r1.28.2.1
  --- ServerInvoker.java	21 Mar 2006 21:29:16 -0000	1.28
  +++ ServerInvoker.java	27 Sep 2006 18:23:27 -0000	1.28.2.1
  @@ -56,7 +56,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.28 $
  + * @version $Revision: 1.28.2.1 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -847,6 +847,7 @@
            if(clientLease != null)
            {
               clientLease.terminateLease(leasePeriod);
  +            clientLeases.remove(clientSessionId);
            }
         }
      }
  @@ -863,7 +864,8 @@
               {
                  Lease newClientLease = new Lease(clientSessionId, leasePeriod,
                                                   locator.getLocatorURI(), invocation.getRequestPayload(),
  -                                                connectionNotifier);
  +                                                connectionNotifier,
  +                                                clientLeases);
                  clientLeases.put(clientSessionId, newClientLease);
                  newClientLease.startLease();
               }