[jboss-remoting-commits] JBoss Remoting SVN: r5670 - remoting2/branches/2.x/src/main/org/jboss/remoting/security.
Author: ron.sigal(a)jboss.com
Date: 2010-01-20 12:54:33 -0500 (Wed, 20 Jan 2010)
New Revision: 5670
Modified:
remoting2/branches/2.x/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.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java
===================================================================
---
remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2010-01-12
04:23:36 UTC (rev 5669)
+++
remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2010-01-20
17:54:33 UTC (rev 5670)
@@ -1508,7 +1508,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