From: Ron S. <ron...@ya...> - 2006-06-22 21:03:12
|
User: rsigal Date: 06/06/22 17:03:10 Modified: src/main/org/jboss/remoting ServerInvoker.java Log: JBREM-368, JBREM-491, JBREM-520: Removed call to justNeedsSSLServerMode() in createServerSocketFactory(). Revision Changes Path 1.41 +10 -21 JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ServerInvoker.java =================================================================== RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v retrieving revision 1.40 retrieving revision 1.41 diff -u -b -r1.40 -r1.41 --- ServerInvoker.java 22 Jun 2006 03:26:38 -0000 1.40 +++ ServerInvoker.java 22 Jun 2006 21:03:10 -0000 1.41 @@ -60,7 +60,7 @@ * * @author <a href="mailto:jh...@vo...">Jeff Haynie</a> * @author <a href="mailto:tom...@jb...">Tom Elrod</a> - * @version $Revision: 1.40 $ + * @version $Revision: 1.41 $ */ public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean { @@ -392,17 +392,7 @@ } } - if (serverSocketFactory == null) - { - if (justNeedsSSLClientMode(configuration)) - { - SSLSocketBuilder socketBuilder = new SSLSocketBuilder(); - socketBuilder.setServerSocketUseClientMode( true ); - SSLServerSocketFactory defaultFactory = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); - serverSocketFactory = new CustomSSLServerSocketFactory(defaultFactory, socketBuilder); - } - - else if (needsCustomSSLConfiguration(configuration)) + if (serverSocketFactory == null && needsCustomSSLConfiguration(configuration)) { try { @@ -415,7 +405,6 @@ throw new RuntimeException("Unable to create customized SSL socket factory", e); } } - } if(serverSocketFactory == null) { @@ -459,7 +448,7 @@ * is this method will be overridden by sub-classes for their specific defaults. * @return */ - protected ServerSocketFactory getDefaultServerSocketFactory() + protected ServerSocketFactory getDefaultServerSocketFactory() throws IOException { return ServerSocketFactory.getDefault(); } |