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

[Ovidiu Feodorov]

  User: ovidiu  
  Date: 07/01/16 03:15:04

  Modified:    src/main/org/jboss/remoting/transport/multiplex  Tag:
                        remoting_2_x MultiplexServerInvoker.java
  Log:
  flushing minor changes (trivial refactoring, logging improvments) before attempting a fix for http://jira.jboss.org/jira/browse/JBREM-666
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.59.2.2  +8 -34     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.1
  retrieving revision 1.59.2.2
  diff -u -b -r1.59.2.1 -r1.59.2.2
  --- MultiplexServerInvoker.java	2 Nov 2006 18:43:21 -0000	1.59.2.1
  +++ MultiplexServerInvoker.java	16 Jan 2007 08:15:04 -0000	1.59.2.2
  @@ -31,7 +31,6 @@
   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;
  @@ -68,6 +67,8 @@
   {
      protected static final Logger log = Logger.getLogger(MultiplexServerInvoker.class);
      
  +   private static boolean trace = log.isTraceEnabled();
  +   
      private static Map socketGroupMap = new HashMap();
      private static Map addressPairMap = new HashMap();
      private static HandshakeCompletedEvent handshakeCompletedEvent;
  @@ -167,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;
  @@ -201,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());
  @@ -215,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,
  @@ -251,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()
      {
  @@ -1087,9 +1068,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)
      {
  @@ -1103,7 +1081,6 @@
   /**
    * Provides access to all virtual <code>MultiplexServerInvoker</code>s in a master
    * <code>MultiplexServerInvoker</code>'s invoker farm.
  - * @return
    */
      public Collection getServerInvokers()
      {
  @@ -1113,9 +1090,6 @@
         }
      }
      
  -/**
  - * 
  - */
      protected void setBindingInfo() throws IOException
      {
         String originalUri = getLocator().getOriginalURI();