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

[Ron Sigal]

  User: rsigal  
  Date: 06/10/29 15:43:20

  Modified:    src/main/org/jboss/remoting/transport/multiplex 
                        MultiplexServerInvoker.java
  Log:
  JBREM-619:  In run(), put ServerSocketRefresh thread interrupt in a finally clause.
  
  Revision  Changes    Path
  1.59      +74 -63    JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexServerInvoker.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -b -r1.58 -r1.59
  --- MultiplexServerInvoker.java	23 Aug 2006 07:26:33 -0000	1.58
  +++ MultiplexServerInvoker.java	29 Oct 2006 20:43:20 -0000	1.59
  @@ -276,6 +276,9 @@
         ServerSocketRefresh thread=new ServerSocketRefresh();
         thread.setDaemon(true);
         thread.start();
  +      
  +      try
  +      {
         while(running)
         {
            try
  @@ -312,8 +315,10 @@
                  return;
               }
               else
  +               {
                  log.info(e);
            }
  +            }
            catch (SocketTimeoutException e)
            {
               if(running)
  @@ -357,11 +362,17 @@
                  }
               }
               else
  +               {
               	log.info(ex);
            }
         }
  +         }
  +      }
  +      finally
  +      {
         thread.interrupt();
      }
  +   }
      
      
      public boolean isSafeToShutdown()