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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/20 01:17:07

  Modified:    src/main/org/jboss/remoting  Tag:
                        remoting_2_2_2_experimental Lease.java
  Log:
  JBREM-783: Reverted to version before JBREM-783 changes.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1.4.1.2.3 +8 -34     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.11.2.1.4.1.2.2
  retrieving revision 1.11.2.1.4.1.2.3
  diff -u -b -r1.11.2.1.4.1.2.2 -r1.11.2.1.4.1.2.3
  --- Lease.java	18 Aug 2007 00:35:08 -0000	1.11.2.1.4.1.2.2
  +++ Lease.java	20 Aug 2007 05:17:07 -0000	1.11.2.1.4.1.2.3
  @@ -24,10 +24,7 @@
   import org.jboss.logging.Logger;
   import org.jboss.remoting.util.TimerUtil;
   
  -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
  -
   import java.util.Collection;
  -import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
   import java.util.TimerTask;
  @@ -46,7 +43,7 @@
      private String clientSessionId = null;
      private long leasePeriod = -1;
      private String locatorURL = null;
  -   private Map leaseHolders = null;
  +   private Map requestPayload = null;
      private LeaseTimerTask leaseTimerTask = null;
      private long leaseWindow = -1;
      private long pingStart = -1;
  @@ -66,22 +63,8 @@
         this.locatorURL = locatorurl;
         if(requestPayload != null)
         {
  -         Object o = requestPayload.get(ClientHolder.CLIENT_HOLDER_KEY);
  -         if (o instanceof Map)
  -         {
  -            this.leaseHolders = new ConcurrentHashMap((Map) o);
  -         }
  -         else
  -         {
  -            log.warn((clientSessionId + ": unrecognized client holder: " + o.getClass() + ": " + o));
  -            this.leaseHolders = new ConcurrentHashMap();
  -         }
  +         this.requestPayload = (Map)requestPayload.get(ClientHolder.CLIENT_HOLDER_KEY);
         }
  -      else
  -      {
  -         this.leaseHolders = new ConcurrentHashMap();
  -      }
  -
         this.leaseWindow = leasePeriod * 2;
         this.clientLeases = clientLeases;
      }
  @@ -101,16 +84,7 @@
      {
         if(requestMap != null)
         {
  -         Object o = requestMap.get(ClientHolder.CLIENT_HOLDER_KEY);
  -         if (o instanceof ClientHolder)
  -         {
  -            ClientHolder holder = (ClientHolder) o;
  -            leaseHolders.put(holder.getSessionId(), holder);
  -         }
  -         else
  -         {
  -            log.warn(this + " unrecognized object in request payload: " + o);
  -         }
  +         this.requestPayload = (Map)requestMap.get(ClientHolder.CLIENT_HOLDER_KEY);
         }
         updateLease(leasePeriod);
      }
  @@ -173,12 +147,12 @@
      private void notifyClientTermination(String sessionId)
      {
         // is for a particular client, so need to inspect request payload for client
  -      if (leaseHolders != null)
  +      if (requestPayload != null)
         {
            // should notify for one client or all?
            if (sessionId != null)
            {
  -            Object clientHolderObj = leaseHolders.remove(sessionId);
  +            Object clientHolderObj = requestPayload.remove(sessionId);
               if (clientHolderObj != null && clientHolderObj instanceof ClientHolder)
               {
                  ClientHolder clientHolder = (ClientHolder) clientHolderObj;
  @@ -192,7 +166,7 @@
            else
            {
               // loop through and notify for all clients
  -            Collection clientHoldersCol = leaseHolders.values();
  +            Collection clientHoldersCol = requestPayload.values();
               if (clientHoldersCol != null && clientHoldersCol.size() > 0)
               {
                  Iterator itr = clientHoldersCol.iterator();
  @@ -221,10 +195,10 @@
      private void notifyClientLost()
      {
         // is not for a particular client (but all clients associated with client invoker), so need to inspect request payload for client
  -      if (leaseHolders != null && !leaseHolders.isEmpty())
  +      if (requestPayload != null)
         {
            // loop through and notify for all clients
  -         Collection clientHoldersCol = leaseHolders.values();
  +         Collection clientHoldersCol = requestPayload.values();
            if (clientHoldersCol != null && clientHoldersCol.size() > 0)
            {
               Iterator itr = clientHoldersCol.iterator();