Author: ron.sigal(a)jboss.com
Date: 2008-02-28 01:15:39 -0500 (Thu, 28 Feb 2008)
New Revision: 3534
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
Log:
JBREM-522: Puts callback SSLServerSocketFactory in client mode.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-02-28 03:15:55 UTC
(rev 3533)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-02-28 06:15:39 UTC
(rev 3534)
@@ -31,6 +31,7 @@
import org.jboss.remoting.invocation.OnewayInvocation;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.remoting.security.SSLSocketBuilder;
import org.jboss.remoting.stream.StreamServer;
import org.jboss.remoting.transport.BidirectionalClientInvoker;
import org.jboss.remoting.transport.ClientInvoker;
@@ -940,6 +941,8 @@
{
callbackConfig.putAll(locator.getParameters());
}
+
+ configureCallbackServerSocketFactory(callbackConfig);
Connector callbackServerConnector = new Connector(callbackLocator,
callbackConfig);
synchronized (callbackConnectors)
@@ -1793,6 +1796,14 @@
}
}
+ private void configureCallbackServerSocketFactory(Map map) throws Exception
+ {
+ if (InvokerRegistry.isSSLSupported(locator.getProtocol()) &&
+ !map.containsKey(Remoting.CUSTOM_SERVER_SOCKET_FACTORY) &&
+ !map.containsKey(ServerInvoker.SERVER_SOCKET_FACTORY) &&
+ !map.containsKey(SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE))
+ map.put(SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE,
"true");
+ }
// Inner classes
--------------------------------------------------------------------------------
class InvokerDestructionTimerTask extends TimerTask
Show replies by date