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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 04:20:21

  Modified:    src/main/org/jboss/remoting/transport/sslmultiplex 
                        SSLMultiplexClientInvoker.java
  Log:
  JBREM-298: Added ability to wrap SocketFactory.
  
  Revision  Changes    Path
  1.5       +14 -3     JBossRemoting/src/main/org/jboss/remoting/transport/sslmultiplex/SSLMultiplexClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLMultiplexClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslmultiplex/SSLMultiplexClientInvoker.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SSLMultiplexClientInvoker.java	20 Sep 2006 04:22:25 -0000	1.4
  +++ SSLMultiplexClientInvoker.java	16 Jan 2007 09:20:21 -0000	1.5
  @@ -28,6 +28,7 @@
   import org.jboss.logging.Logger;
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.security.SSLSocketBuilder;
  +import org.jboss.remoting.socketfactory.SocketFactoryWrapper;
   import org.jboss.remoting.transport.multiplex.Multiplex;
   import org.jboss.remoting.transport.multiplex.MultiplexClientInvoker;
   import org.jboss.remoting.transport.multiplex.VirtualSocket;
  @@ -43,7 +44,7 @@
    * For more information, see Remoting documentation on labs.jboss.org.
    *
    * @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    * <p>
    * Copyright (c) 2006
    * </p>
  @@ -79,24 +80,34 @@
      {
         SocketFactory sf = super.createSocketFactory(configuration);
   
  -      if (sf != null)
  +      if (isCompleteSocketFactory(sf))
         {
            socketFactory = sf;
            return sf;
         }
   
  +      SocketFactory wrapper = sf;
  +
         try
         {
            SSLSocketBuilder server = new SSLSocketBuilder(configuration);
  +         server.setUseSSLSocketFactory(false);
            sf = server.createSSLSocketFactory();
            this.configuration.put(Multiplex.SOCKET_FACTORY, sf);
  -         socketFactory = sf;
         }
         catch(Exception e)
         {
            log.error("Error creating SSL Socket Factory for client invoker.", e);
         }
   
  +      if (wrapper != null)
  +      {
  +         ((SocketFactoryWrapper) wrapper).setSocketFactory(sf);
  +         socketFactory = wrapper;
  +         return wrapper;
  +      }
  +      
  +      socketFactory = sf;
         return sf;
      }