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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 01:21:36

  Modified:    src/main/org/jboss/remoting/transport/sslrmi  Tag:
                        remoting_2_x SSLRMIServerInvoker.java
  Log:
  JBREM-298: Removed socket creation listener and custom server socket factory from config map passed to SerializableSSLClientSocketFactory.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +8 -1      JBossRemoting/src/main/org/jboss/remoting/transport/sslrmi/SSLRMIServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLRMIServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslrmi/SSLRMIServerInvoker.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -b -r1.1 -r1.1.4.1
  --- SSLRMIServerInvoker.java	12 Jul 2006 04:49:51 -0000	1.1
  +++ SSLRMIServerInvoker.java	16 Jan 2007 06:21:36 -0000	1.1.4.1
  @@ -23,6 +23,7 @@
   package org.jboss.remoting.transport.sslrmi;
   
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.Remoting;
   import org.jboss.remoting.security.SSLSocketBuilder;
   import org.jboss.remoting.transport.rmi.RMIServerInvoker;
   
  @@ -36,7 +37,7 @@
   /**
    *
    * @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.1.4.1 $
    * <p>
    * Copyright (c) Jun 9, 2006
    * </p>
  @@ -69,6 +70,12 @@
         remoteConfig.remove(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD);
         remoteConfig.remove(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE);
   
  +      // Remove ServerSocketFactory.
  +      remoteConfig.remove(Remoting.CUSTOM_SERVER_SOCKET_FACTORY);
  +      
  +      // Remove server side socket creation listener.
  +      remoteConfig.remove(Remoting.SOCKET_CREATION_LISTENER);
  +
         // If server socket should use client mode, then default behavior will be for socket
         // to not use client mode.
         String serverSocketUseClientModeString