You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/09/02 21:22:37 UTC
svn commit: r1380036 -
/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Author: pmouawad
Date: Sun Sep 2 19:22:37 2012
New Revision: 1380036
URL: http://svn.apache.org/viewvc?rev=1380036&view=rev
Log:
Fixed as per dev list sebb remark
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?rev=1380036&r1=1380035&r2=1380036&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sun Sep 2 19:22:37 2012
@@ -234,7 +234,12 @@ public final class JmeterKeyStore {
// }
aliases[i] = this.names[i];
}
- return aliases;
+ if(aliases.length>0) {
+ return aliases;
+ } else {
+ // API expects null not empty array, see http://javasourcecode.org/html/open-source/jdk/jdk-6u23/javax/net/ssl/X509KeyManager.java.html
+ return null;
+ }
}
}
\ No newline at end of file