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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 04:24:48

  Modified:    src/main/org/jboss/remoting/transport/sslsocket 
                        SSLSocketClientInvoker.java
  Log:
  JBREM-298: Added ability to wrap SocketFactory.
  
  Revision  Changes    Path
  1.4       +12 -2     JBossRemoting/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SSLSocketClientInvoker.java	20 Sep 2006 04:22:25 -0000	1.3
  +++ SSLSocketClientInvoker.java	16 Jan 2007 09:24:48 -0000	1.4
  @@ -26,6 +26,7 @@
   import org.jboss.remoting.Client;
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.security.SSLSocketBuilder;
  +import org.jboss.remoting.socketfactory.SocketFactoryWrapper;
   import org.jboss.remoting.transport.socket.SocketClientInvoker;
   import org.jboss.remoting.util.socket.HandshakeRepeater;
   
  @@ -76,11 +77,13 @@
      {
         SocketFactory sf = super.createSocketFactory(configuration);
   
  -      if (sf != null)
  +      if (isCompleteSocketFactory(sf))
         {
            return sf;
         }
   
  +      SocketFactory wrapper = sf;
  +
         try
         {
            SSLSocketBuilder server = new SSLSocketBuilder(configuration);
  @@ -91,6 +94,13 @@
            log.error("Error creating SSL Socket Factory for client invoker.", e);
         }
   
  +      if (wrapper != null)
  +      {
  +         ((SocketFactoryWrapper) wrapper).setSocketFactory(sf);
  +         socketFactory = wrapper;
  +         return wrapper;
  +      }
  +      
         return sf;
      }