Author: sebb
Date: Fri Jul 6 17:57:55 2007
New Revision: 554102
URL: http://svn.apache.org/viewvc?view=rev&rev=554102
Log:
Fix NPE when password is not provided
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java?view=diff&rev=554102&r1=554101&r2=554102
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
Fri Jul 6 17:57:55 2007
@@ -228,7 +228,7 @@
KeyManagerFactory managerFactory =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
JmeterKeyStore keys = this.getKeyStore();
- managerFactory.init(null, this.defaultpw.toCharArray());
+ managerFactory.init(null, defaultpw == null ? new char[]{} :
defaultpw.toCharArray());
KeyManager[] managers = managerFactory.getKeyManagers();
log.debug(keys.getClass().toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
