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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 03:23:49

  Modified:    src/main/org/jboss/remoting/transport/rmi 
                        RMIServerInvoker.java
  Log:
  JBREM-298: Removed socket creation listener (and custom socket server socket factory) from config map passed to RemotingRMIClientSocketFactory.
  
  Revision  Changes    Path
  1.18      +11 -4     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
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- RMIServerInvoker.java	1 Aug 2006 06:29:02 -0000	1.17
  +++ RMIServerInvoker.java	16 Jan 2007 08:23:49 -0000	1.18
  @@ -23,12 +23,14 @@
   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;
   import org.jboss.remoting.marshal.UnMarshaller;
   import org.jboss.remoting.marshal.UnMarshallerDecorator;
   import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
  +import org.jboss.logging.Logger;
   
   import javax.net.SocketFactory;
   import java.io.ByteArrayInputStream;
  @@ -43,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;
   
   /**
  @@ -50,10 +53,12 @@
    *
    * @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 $
  + * @version $Revision: 1.18 $
    */
   public class RMIServerInvoker extends ServerInvoker implements RMIServerInvokerInf
   {
  +   private static final Logger log = Logger.getLogger(RMIServerInvoker.class);
  +
      private Remote stub;
   
      /**
  @@ -118,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()
  @@ -229,8 +238,6 @@
       * returns true if the transport is bi-directional in nature, for example,
       * SOAP in unidirectional and SOCKETs are bi-directional (unless behind a firewall
       * for example).
  -    *
  -    * @return
       */
      public boolean isTransportBiDirectional()
      {