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

[Ron Sigal]

  User: rsigal  
  Date: 07/07/29 02:03:17

  Modified:    src/main/org/jboss/remoting/transport/bisocket  Tag:
                        remoting_2_2_0_GA BisocketClientInvoker.java
  Log:
  JBREM-779:  replaceControlSocket() creates a new Timer only if necessary.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13.2.5 +14 -2     JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java,v
  retrieving revision 1.1.2.13.2.4
  retrieving revision 1.1.2.13.2.5
  diff -u -b -r1.1.2.13.2.4 -r1.1.2.13.2.5
  --- BisocketClientInvoker.java	30 Jun 2007 02:54:53 -0000	1.1.2.13.2.4
  +++ BisocketClientInvoker.java	29 Jul 2007 06:03:16 -0000	1.1.2.13.2.5
  @@ -421,10 +421,22 @@
   
         synchronized (timerLock)
         {
  +         if (timer == null)
  +         {
            timer = new Timer(true);
         }
  +         try
  +         {
         timer.schedule(pingTimerTask, pingFrequency, pingFrequency);
      }
  +         catch (IllegalStateException e)
  +         {
  +            log.debug("Unable to schedule TimerTask on existing Timer", e);
  +            timer = new Timer(true);
  +            timer.schedule(pingTimerTask, pingFrequency, pingFrequency);
  +         }
  +      }
  +   }
   
   
      InvokerLocator getSecondaryLocator() throws Throwable