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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 01:01:10

  Modified:    src/main/org/jboss/remoting/transport/rmi  Tag: remoting_2_x
                        RMIServerInvoker.java
  Log:
  JBREM-298: Removed socket creation listener (and custom socket server socket factory) from config map passed to RemotingRMIClientSocketFactory.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.17.4.2  +8 -2      JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RMIServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java,v
  retrieving revision 1.17.4.1
  retrieving revision 1.17.4.2
  diff -u -b -r1.17.4.1 -r1.17.4.2
  --- RMIServerInvoker.java	13 Jan 2007 12:42:35 -0000	1.17.4.1
  +++ RMIServerInvoker.java	16 Jan 2007 06:01:10 -0000	1.17.4.2
  @@ -23,6 +23,7 @@
   package org.jboss.remoting.transport.rmi;
   
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.Remoting;
   import org.jboss.remoting.ServerInvoker;
   import org.jboss.remoting.marshal.MarshalFactory;
   import org.jboss.remoting.marshal.Marshaller;
  @@ -44,6 +45,7 @@
   import java.rmi.server.RMIClientSocketFactory;
   import java.rmi.server.RMIServerSocketFactory;
   import java.rmi.server.UnicastRemoteObject;
  +import java.util.HashMap;
   import java.util.Map;
   
   /**
  @@ -51,7 +53,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.17.4.1 $
  + * @version $Revision: 1.17.4.2 $
    */
   public class RMIServerInvoker extends ServerInvoker implements RMIServerInvokerInf
   {
  @@ -121,7 +123,11 @@
   
      protected RMIClientSocketFactory getRMIClientSocketFactory(String clientConnectHost)
      {
  -      return new RemotingRMIClientSocketFactory(getSocketFactory(), clientConnectHost, getTimeout());
  +      // Remove server side socket creation listener.
  +      HashMap remoteConfig = new HashMap(configuration);
  +      remoteConfig.remove(Remoting.CUSTOM_SERVER_SOCKET_FACTORY);
  +      remoteConfig.remove(Remoting.SOCKET_CREATION_LISTENER);
  +      return new RemotingRMIClientSocketFactory(locator, clientConnectHost, getTimeout(), remoteConfig);
      }
      
      protected SocketFactory getDefaultSocketFactory()