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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 18:23:43

  Modified:    src/main/org/jboss/remoting/transport/sslbisocket  Tag:
                        remoting_2_x SSLBisocketServerInvoker.java
  Log:
  JBREM-298: Added ability to wrap SocketFactory.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +11 -3     JBossRemoting/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLBisocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- SSLBisocketServerInvoker.java	13 Jan 2007 12:42:36 -0000	1.1.2.2
  +++ SSLBisocketServerInvoker.java	16 Jan 2007 23:23:43 -0000	1.1.2.3
  @@ -24,6 +24,7 @@
   
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.security.SSLSocketBuilder;
  +import org.jboss.remoting.socketfactory.SocketFactoryWrapper;
   import org.jboss.remoting.transport.bisocket.BisocketServerInvoker;
   import org.jboss.remoting.transport.sslsocket.SSLSocketServerInvokerMBean;
   import org.jboss.logging.Logger;
  @@ -83,10 +84,10 @@
      {
         SocketFactory sf = super.createSocketFactory(configuration);
   
  -      if (sf != null)
  -      {
  +      if (isCompleteSocketFactory(sf))
            return sf;
  -      }
  +      
  +      SocketFactory wrapper = sf;
   
         try
         {
  @@ -98,9 +99,16 @@
            log.error("Error creating SSL Socket Factory for client invoker.", e);
         }
   
  +      if (wrapper != null)
  +      {
  +         ((SocketFactoryWrapper) wrapper).setSocketFactory(sf);
  +         return wrapper;
  +      }
  +      
         return sf;
      }
      
  +   
      protected ServerSocket createServerSocket(int serverBindPort, int backlog, InetAddress bindAddress) throws IOException
      {
         ServerSocket svrSocket = getServerSocketFactory().createServerSocket(serverBindPort, backlog, bindAddress);