[jboss-cvs] JBoss Messaging SVN: r3766 - in trunk/src/main/org/jboss/messaging/core/remoting: ssl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 22 03:45:49 EST 2008
Author: jmesnil
Date: 2008-02-22 03:45:49 -0500 (Fri, 22 Feb 2008)
New Revision: 3766
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
trunk/src/main/org/jboss/messaging/core/remoting/ssl/SSLSupport.java
Log:
* in FilterChainSupport.addSSLFilter(), fixed boolean condition for client
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java 2008-02-22 01:45:04 UTC (rev 3765)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java 2008-02-22 08:45:49 UTC (rev 3766)
@@ -78,7 +78,7 @@
DefaultIoFilterChainBuilder filterChain, boolean client,
String keystorePath, String keystorePassword, String trustStorePath, String trustStorePassword) throws Exception
{
- SSLContext context = SSLSupport.getInstance(!client, keystorePath, keystorePassword,
+ SSLContext context = SSLSupport.getInstance(client, keystorePath, keystorePassword,
trustStorePath, trustStorePassword);
SslFilter filter = new SslFilter(context);
if (client)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/ssl/SSLSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ssl/SSLSupport.java 2008-02-22 01:45:04 UTC (rev 3765)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ssl/SSLSupport.java 2008-02-22 08:45:49 UTC (rev 3766)
@@ -124,6 +124,9 @@
private static KeyStore loadKeystore(String keystorePath,
String keystorePassword) throws Exception
{
+ assert keystorePath != null;
+ assert keystorePassword != null;
+
KeyStore ks = KeyStore.getInstance("JKS");
InputStream in = null;
try
@@ -158,6 +161,8 @@
private static URL validateStoreURL(String storePath) throws Exception
{
+ assert storePath != null;
+
// First see if this is a URL
try
{
More information about the jboss-cvs-commits
mailing list