Author: ron.sigal(a)jboss.com Date: 2009-04-22 23:36:18 -0400 (Wed, 22 Apr 2009) New Revision: 5085 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java Log: JBREM-1120: Moved SocketFactory creation from SSLBisocketServerInvoker to BisocketServerInvoker. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-04-22 23:59:35 UTC (rev 5084) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-04-23 03:36:18 UTC (rev 5085) @@ -726,6 +726,11 @@ { secondaryConnectPorts = new ArrayList(secondaryBindPorts); } + + if (isCallbackServer) + { + socketFactory = createSocketFactory(configuration); + } } Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java 2009-04-22 23:59:35 UTC (rev 5084) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketServerInvoker.java 2009-04-23 03:36:18 UTC (rev 5085) @@ -122,11 +122,6 @@ o = configuration.get("enabledProtocols"); if (o instanceof String[]) setEnabledProtocols((String[]) o); - - if (isCallbackServer) - { - socketFactory = createSocketFactory(configuration); - } } protected SocketFactory createSocketFactory(Map configuration)