[jboss-remoting-commits] JBoss Remoting SVN: r5672 - remoting2/branches/2.2/src/main/org/jboss/remoting/security.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2010-01-20 12:58:38 -0500 (Wed, 20 Jan 2010)
New Revision: 5672

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java
Log:
JBREM-1181: If keystore password is null, won't try to turn it into a char array.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java	2010-01-20 17:55:22 UTC (rev 5671)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java	2010-01-20 17:58:38 UTC (rev 5672)
@@ -1494,7 +1494,8 @@
             keyPasswd = ksPasswd;
          }
 
-         keyMgrFactory.init(keyStore, keyPasswd.toCharArray());
+         char[] keyPasswdCharArray = keyPasswd == null ? null : keyPasswd.toCharArray();
+         keyMgrFactory.init(keyStore, keyPasswdCharArray);
          keyManagers = keyMgrFactory.getKeyManagers();
 
          // if alias provided, use helper impl to hard wire alias name to be used