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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/10 20:21:02

  Modified:    src/main/org/jboss/remoting  LeasePinger.java
  Log:
  JBREM-663:  LeasePinger now runs on its own Timer.
  
  Revision  Changes    Path
  1.10      +15 -12    JBossRemoting/src/main/org/jboss/remoting/LeasePinger.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LeasePinger.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/LeasePinger.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- LeasePinger.java	12 Dec 2006 05:16:50 -0000	1.9
  +++ LeasePinger.java	11 Jan 2007 01:21:02 -0000	1.10
  @@ -9,6 +9,7 @@
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  +import java.util.Timer;
   import java.util.TimerTask;
   
   /**
  @@ -18,6 +19,8 @@
    */
   public class LeasePinger
   {
  +   private static Timer timer = new Timer();
  +   
      private ClientInvoker client = null;
      private long pingPeriod = -1;
      private long defaultPingPeriod = -1;
  @@ -40,17 +43,17 @@
      {
         if(isTraceEnabled)
         {
  -         log.trace("Starting lease timer for client invoker (session id " + invokerSessionId + ") with ping period of " + pingPeriod);
  +         log.trace("Starting lease timer for client invoker with session ID " + invokerSessionId + " with ping period of " + pingPeriod);
         }
         timerTask = new LeaseTimerTask();
  -      TimerUtil.schedule(timerTask, pingPeriod);
  +      timer.schedule(timerTask, pingPeriod, pingPeriod);
      }
   
      public synchronized void stopPing()
      {
         if(isTraceEnabled)
         {
  -         log.trace("Stopping lease timer for client invoker (session id " + invokerSessionId + ")");
  +         log.trace("Stopping lease timer for client invoker with session ID " + invokerSessionId);
         }
         if (timerTask != null)
         {
  @@ -89,7 +92,7 @@
                        clientSessionIds = clientSessionIds + h.getSessionId() + "\n";
                     }
                  }
  -               log.trace("Sending ping to server for client invoker (session id " + invokerSessionId + ".  " +
  +               log.trace("Sending ping to server for client invoker with session ID " + invokerSessionId + ".  " +
                            "Currently managing lease for following clients:\n" + clientSessionIds);
               } // end trace
   
  @@ -101,7 +104,7 @@
            }
            catch (Throwable throwable)
            {
  -            log.warn("Error sending lease ping to server for client invoker (session id " + invokerSessionId + ".");
  +            log.warn("Error sending lease ping to server for client invoker with session ID " + invokerSessionId);
            }
         }
      }
  @@ -115,8 +118,8 @@
   
         if(isTraceEnabled)
         {
  -         log.trace("Adding new client to lease for client invoker (session id " + invokerSessionId + ") where " +
  -                   "client session id is " + sessionId + " and lease period is " + leasePeriod);
  +         log.trace("Adding new client to lease for client invoker with session ID " + invokerSessionId + " where " +
  +                   "client session ID is " + sessionId + " and lease period is " + leasePeriod);
         }
         ClientHolder newClient = new ClientHolder(sessionId, configuration, leasePeriod);
         clients.put(sessionId, newClient);
  @@ -143,7 +146,7 @@
   
         if(isTraceEnabled)
         {
  -         log.trace("Removing client (session id " + sessionId + ") from lease for client invoker (session id " + invokerSessionId + ")");
  +         log.trace("Removing client with session ID " + sessionId + " from lease for client invoker with session ID " + invokerSessionId);
         }
         ClientHolder holder = (ClientHolder) clients.remove(sessionId);
         if (holder != null)
  @@ -156,17 +159,17 @@
               client.invoke(new InvocationRequest(invokerSessionId, null, "$DISCONNECT$", clientMap, null, null));
               if(isTraceEnabled)
               {
  -               log.trace("Sent out disconnect message to server for lease tied to client session id " + sessionId);
  +               log.trace("Sent out disconnect message to server for lease tied to client session ID " + sessionId);
               }
            }
            catch (Throwable throwable)
            {
  -            log.warn("Error sending disconnect for client lease where client session id is " + sessionId);
  +            log.warn("Error sending disconnect for client lease where client session ID is " + sessionId);
            }
         }
         else
         {
  -         log.warn("Tried to remove lease for client (session id " + sessionId + "), but did not exist for client invoker lease (session id " + invokerSessionId);
  +         log.warn("Tried to remove lease for client with session ID " + sessionId + ", but did not exist for client invoker lease (session ID " + invokerSessionId + ")");
         }
   
         if (clients.isEmpty())
  @@ -174,7 +177,7 @@
            isLastClientLease = true;
            if(isTraceEnabled)
            {
  -            log.trace("There are no more client leases tied to this client invoker's lease (session id " + invokerSessionId);
  +            log.trace("There are no more client leases tied to this client invoker's lease (session ID " + invokerSessionId + ")");
            }
         }
         else