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

[Ron Sigal]

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

  Modified:    src/main/org/jboss/remoting/transport/multiplex 
                        MultiplexServerInvoker.java
  Log:
  JBREM-729: (1) Doesn't stop run() in case of EOFException; (2) sets timeout for MasterServerSockets.
  
  Revision  Changes    Path
  1.62      +7 -41     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.61
  retrieving revision 1.62
  diff -u -b -r1.61 -r1.62
  --- MultiplexServerInvoker.java	16 Feb 2007 02:49:00 -0000	1.61
  +++ MultiplexServerInvoker.java	27 Mar 2007 08:12:22 -0000	1.62
  @@ -168,19 +168,11 @@
      private int     multiplexConnectPort;
      private boolean multiplexConnectPortIsSet;  // to check for missing configuration information
   
  -   
  -/**
  - * @return
  - */
      public static Map getAddressPairMap()
      {
         return addressPairMap;
      }
      
  -   
  -/**
  - * @return
  - */
      public static Map getSocketGroupMap()
      {
         return socketGroupMap;
  @@ -202,13 +194,9 @@
   
      
   /**
  - * 
    * Create a new <code>MultiplexServerInvoker</code>.
  - * 
  - * @param locator
  - * @param configuration
    */
  -   public MultiplexServerInvoker(InvokerLocator locator, Map configuration) throws IOException
  +   public MultiplexServerInvoker(InvokerLocator locator, Map configuration)
      {
         super(locator, configuration);
   //      virtualServerInvokers = Collections.synchronizedMap(new HashMap());
  @@ -216,14 +204,8 @@
      }
   
      
  -/**
  - * 
  +   /**
    * Create a new <code>MultiplexServerInvoker</code>.
  - * @param locator
  - * @param configuration
  - * @param serverSocket
  - * @param virtualServerInvokers 
  - * @param primintSocket 
    */
      protected MultiplexServerInvoker(InvokerLocator locator, Map configuration,
                                       ServerSocket serverSocket, Socket socket,
  @@ -252,8 +234,6 @@
       * Each implementation of the remote client invoker should have
       * a default data type that is uses in the case it is not specified
       * in the invoker locator uri.
  -    *
  -    * @return
       */
      protected String getDefaultDataType()
      {
  @@ -336,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);
  @@ -890,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);
  @@ -1088,9 +1061,6 @@
   /**
    * Provides access to a virtual <code>MultiplexServerInvoker</code> in a master
    * <code>MultiplexServerInvoker</code>'s invoker farm.
  - * 
  - * @param address
  - * @return
    */
      public MultiplexServerInvoker getServerInvoker(InetSocketAddress address)
      {
  @@ -1104,7 +1074,6 @@
   /**
    * Provides access to all virtual <code>MultiplexServerInvoker</code>s in a master
    * <code>MultiplexServerInvoker</code>'s invoker farm.
  - * @return
    */
      public Collection getServerInvokers()
      {
  @@ -1114,9 +1083,6 @@
         }
      }
      
  -/**
  - * 
  - */
      protected void setBindingInfo() throws IOException
      {
         String originalUri = getLocator().getOriginalURI();