[jbossweb-commits] JBossWeb SVN: r662 - trunk/java/org/jboss/web/cluster.
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-10 05:39:24 -0400 (Tue, 10 Jun 2008)
New Revision: 662
Modified:
trunk/java/org/jboss/web/cluster/JSSESocketFactory.java
Log:
Allow empty password in the truststore file.
Modified: trunk/java/org/jboss/web/cluster/JSSESocketFactory.java
===================================================================
--- trunk/java/org/jboss/web/cluster/JSSESocketFactory.java 2008-06-09 10:00:54 UTC (rev
661)
+++ trunk/java/org/jboss/web/cluster/JSSESocketFactory.java 2008-06-10 09:39:24 UTC (rev
662)
@@ -206,6 +206,8 @@
String truststorePassword = listener.getSslTrustStorePassword();
if( truststorePassword == null ) {
truststorePassword = listener.getSslKeyStorePass();
+ } else if (truststorePassword.equals("")) {
+ truststorePassword = null;
}
String truststoreType = listener.getSslTrustStoreType();
if(truststoreType == null) {
@@ -216,7 +218,7 @@
truststoreProvider = keystoreProvider;
}
- if (listener.getSslTrustStore() != null && truststorePassword != null){
+ if (listener.getSslTrustStore() != null){
trustStore = getStore(truststoreType, truststoreProvider,
listener.getSslTrustStore(), truststorePassword);
}
@@ -247,7 +249,10 @@
istream = new FileInputStream(keyStoreFile);
}
- ks.load(istream, pass.toCharArray());
+ if (pass == null)
+ ks.load(istream, null);
+ else
+ ks.load(istream, pass.toCharArray());
} catch (FileNotFoundException fnfe) {
log.error(sm.getString("jsse.keystore_load_failed", type, path,
fnfe.getMessage()), fnfe);