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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/25 00:06:54

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x SocketServerInvoker.java
  Log:
  JBREM-654:  Put body of refreshServerSocket in a synchronized block.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.10 +15 -8     JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java,v
  retrieving revision 1.30.2.9
  retrieving revision 1.30.2.10
  diff -u -b -r1.30.2.9 -r1.30.2.10
  --- SocketServerInvoker.java	16 Feb 2007 02:35:35 -0000	1.30.2.9
  +++ SocketServerInvoker.java	25 Feb 2007 05:06:54 -0000	1.30.2.10
  @@ -49,7 +49,7 @@
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.30.2.9 $
  + * @version $Revision: 1.30.2.10 $
    * @jmx:mbean
    */
   public class SocketServerInvoker extends ServerInvoker implements Runnable, SocketServerInvokerMBean
  @@ -114,6 +114,7 @@
    	*/
      public void setNewServerSocketFactory(ServerSocketFactory serverSocketFactory)
      {
  +      log.trace("entering setNewServerSocketFactory()");
         synchronized (serverSocketFactoryLock)
         {
            newServerSocketFactory=true;
  @@ -130,6 +131,9 @@
       */
      protected void refreshServerSocket() throws IOException
      {
  +      log.trace("entering refreshServerSocket()");
  +      synchronized (serverSocketFactoryLock)
  +      {
         newServerSocketFactory=false;
         serverSocket.close();
         serverSocket = null;
  @@ -138,6 +142,8 @@
         serverSocket.setReuseAddress(reuseAddress);
         log.info("ServerSocket has been updated");
      }
  +      log.trace("leavinging refreshServerSocket()");
  +   }
   
      protected void setup() throws Exception
      {
  @@ -683,6 +689,7 @@
                  try
                  {
                     serverSocketFactoryLock.wait();
  +                  log.trace("ServerSocketRefresh thread woke up");
                  }
                  catch (InterruptedException e)
                  {