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

[Ron Sigal]

  User: rsigal  
  Date: 06/07/23 01:37:33

  Modified:    src/main/org/jboss/remoting/transport/sslrmi 
                        SerializableSSLClientSocketFactory.java
  Log:
  JBREM-537:  Look in local configuration information, instead of configuration map brought over from server, for handshake completion listener.
  
  Revision  Changes    Path
  1.2       +14 -2     JBossRemoting/src/main/org/jboss/remoting/transport/sslrmi/SerializableSSLClientSocketFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SerializableSSLClientSocketFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslrmi/SerializableSSLClientSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SerializableSSLClientSocketFactory.java	12 Jul 2006 04:49:51 -0000	1.1
  +++ SerializableSSLClientSocketFactory.java	23 Jul 2006 05:37:33 -0000	1.2
  @@ -41,7 +41,7 @@
   /**
    * 
    * @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * <p>
    * Copyright (c) Jun 9, 2006
    * </p>
  @@ -104,6 +104,19 @@
                  socketBuilder.setUseSSLSocketFactory( false );
                  socketFactory = socketBuilder.createSSLSocketFactory();
               }
  +            
  +            socketFactories.put(this, socketFactory);
  +            
  +            // Get handshake listener from local configuration map and store in
  +            // configuration map brought over from server.  We don't have to worry
  +            // about the handshake listener being serializable because if we
  +            // find an entry in configMaps, we are running on the client.
  +            if (localConfig != null)
  +            {
  +               Object obj = localConfig.get(Client.HANDSHAKE_COMPLETED_LISTENER);
  +               if (obj != null)
  +                  configuration.put(Client.HANDSHAKE_COMPLETED_LISTENER, obj);
  +            }
            }
            catch (IOException e)
            {
  @@ -114,7 +127,6 @@
         }
         
         Socket s = super.createSocket(host, port);
  -      socketFactories.put(this, socketFactory);
         socketFactory = null;
   
         // need to check for handshake listener and add them if there is one