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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/29 01:54:26

  Modified:    src/main/org/jboss/remoting/callback  Tag: remoting_2_x
                        CallbackPoller.java
  Log:
  JBREM-641:  Synchronizing with branch remoting_2_2_0_GA: (1) Doesn't log error message if running == false, and doesn't set running = true in BlockingPollerThread.run(); (2) in run() if running == false, call stop() before returning (for synchronized shutdown).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.11  +6 -1      JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackPoller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java,v
  retrieving revision 1.5.2.10
  retrieving revision 1.5.2.11
  diff -u -b -r1.5.2.10 -r1.5.2.11
  --- CallbackPoller.java	19 Jun 2007 04:45:37 -0000	1.5.2.10
  +++ CallbackPoller.java	29 Aug 2007 05:54:26 -0000	1.5.2.11
  @@ -203,6 +203,12 @@
         }
         catch (Throwable throwable)
         {
  +    	 if (!running)
  +         {
  +            stop();
  +            return;
  +         }
  +         
            log.error(this + " Error getting callbacks from server.", throwable);
            String errorMessage = throwable.getMessage();
            if (errorMessage != null)
  @@ -323,7 +329,6 @@
   
         public void run()
         {
  -         running = true;
            while (running)
            {
               CallbackPoller.this.run();