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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/27 04:12:23

  Modified:    src/main/org/jboss/remoting/transport/multiplex  Tag:
                        remoting_2_x MultiplexServerInvoker.java
  Log:
  JBREM-729: (1) Doesn't stop run() in case of EOFException; (2) sets timeout for MasterServerSockets.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.59.2.3  +2 -9      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.59.2.2
  retrieving revision 1.59.2.3
  diff -u -b -r1.59.2.2 -r1.59.2.3
  --- MultiplexServerInvoker.java	16 Jan 2007 08:15:04 -0000	1.59.2.2
  +++ MultiplexServerInvoker.java	27 Mar 2007 08:12:23 -0000	1.59.2.3
  @@ -31,6 +31,7 @@
   import java.net.SocketException;
   import java.net.SocketTimeoutException;
   import java.util.Collection;
  +import java.util.Collections;
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.Iterator;
  @@ -66,7 +67,6 @@
   implements Runnable, VirtualSocket.DisconnectListener
   {
      protected static final Logger log = Logger.getLogger(MultiplexServerInvoker.class);
  -
      private static boolean trace = log.isTraceEnabled();
      
      private static Map socketGroupMap = new HashMap();
  @@ -316,14 +316,6 @@
                     }
                  }
               }
  -            catch (EOFException e)
  -            {
  -               log.info("end of file exception: stopping thread");
  -               // If this invoker was started by a Connector, let the Connector stop it.
  -               if (hasMaster)
  -                  stop();
  -               return;
  -            }
               catch (javax.net.ssl.SSLHandshakeException e)
               {
                  log.info("SSLHandshakeException", e);
  @@ -870,6 +862,7 @@
               configuration.put(Multiplex.SERVER_SOCKET_FACTORY, ssf);
            }
            svrSocket = new MasterServerSocket(bindPort, backlog, bindAddress, configuration);
  +         svrSocket.setSoTimeout(getTimeout());
         }
   
         log.debug("Created " + svrSocket.getClass() + ": " + svrSocket);