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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 18:28:46

  Modified:    src/main/org/jboss/remoting    Tag: remoting_2_x
                        Remoting.java ServerInvoker.java
                        AbstractInvoker.java
  Log:
  JBREM-298:  Created distinction between client and server socket creation listeners.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.4.2   +3 -1      JBossRemoting/src/main/org/jboss/remoting/Remoting.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Remoting.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Remoting.java,v
  retrieving revision 1.3.4.1
  retrieving revision 1.3.4.2
  diff -u -b -r1.3.4.1 -r1.3.4.2
  --- Remoting.java	16 Jan 2007 05:50:50 -0000	1.3.4.1
  +++ Remoting.java	16 Jan 2007 23:28:46 -0000	1.3.4.2
  @@ -46,5 +46,7 @@
       */
      public static final String SOCKET_FACTORY_NAME = "socketFactory";
      
  -   public static final String SOCKET_CREATION_LISTENER = "socketCreationListener";
  +   public static final String SOCKET_CREATION_CLIENT_LISTENER = "socketCreationClientListener";
  +   
  +   public static final String SOCKET_CREATION_SERVER_LISTENER = "socketCreationServerListener";
   }
  
  
  
  1.52.2.16 +3 -1      JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.52.2.15
  retrieving revision 1.52.2.16
  diff -u -b -r1.52.2.15 -r1.52.2.16
  --- ServerInvoker.java	16 Jan 2007 08:15:03 -0000	1.52.2.15
  +++ ServerInvoker.java	16 Jan 2007 23:28:46 -0000	1.52.2.16
  @@ -32,6 +32,7 @@
   import org.jboss.remoting.security.ServerSocketFactoryMBean;
   import org.jboss.remoting.security.ServerSocketFactoryWrapper;
   import org.jboss.remoting.socketfactory.CreationListenerServerSocketFactory;
  +import org.jboss.remoting.socketfactory.CreationListenerSocketFactory;
   import org.jboss.remoting.socketfactory.SocketCreationListener;
   import org.jboss.remoting.stream.StreamHandler;
   import org.jboss.remoting.stream.StreamInvocationHandler;
  @@ -48,6 +49,7 @@
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   import javax.net.ServerSocketFactory;
  +import javax.net.SocketFactory;
   
   import java.io.IOException;
   import java.lang.reflect.Constructor;
  @@ -63,7 +65,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.52.2.15 $
  + * @version $Revision: 1.52.2.16 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -521,7 +523,7 @@
         if (config == null)
            return ssf;
         
  -      Object o = config.get(Remoting.SOCKET_CREATION_LISTENER);
  +      Object o = config.get(Remoting.SOCKET_CREATION_SERVER_LISTENER);
         if (o != null && o instanceof SocketCreationListener)
            return new CreationListenerServerSocketFactory(ssf, (SocketCreationListener) o);
         
  
  
  
  1.12.4.9  +2 -2      JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java,v
  retrieving revision 1.12.4.8
  retrieving revision 1.12.4.9
  diff -u -b -r1.12.4.8 -r1.12.4.9
  --- AbstractInvoker.java	16 Jan 2007 05:43:22 -0000	1.12.4.8
  +++ AbstractInvoker.java	16 Jan 2007 23:28:46 -0000	1.12.4.9
  @@ -51,7 +51,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.12.4.8 $
  + * @version $Revision: 1.12.4.9 $
    */
   public abstract class AbstractInvoker implements Invoker
   {
  @@ -322,7 +322,7 @@
         if (config == null)
            return socketFactory;
         
  -      Object o = config.get(Remoting.SOCKET_CREATION_LISTENER);
  +      Object o = config.get(Remoting.SOCKET_CREATION_CLIENT_LISTENER);
         if (o != null && o instanceof SocketCreationListener)
         {
            SocketCreationListener listener = (SocketCreationListener) o;