On 2 September 2012 13:14, <[email protected]> wrote: > Author: pmouawad > Date: Sun Sep 2 12:14:35 2012 > New Revision: 1379954 > > URL: http://svn.apache.org/viewvc?rev=1379954&view=rev > Log: > Document when api expects null instead of empty array > > 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=1379954&r1=1379953&r2=1379954&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 12:14:35 2012 > @@ -129,6 +129,7 @@ public final class JmeterKeyStore { > if (entry >=0) { > return this.certChains[entry]; > } > + // API expects null not empty array, see > http://javasourcecode.org/html/open-source/jdk/jdk-6u23/javax/net/ssl/X509KeyManager.java.html
Although it's true that X509KeyManager expects null, this class is not actually related to X509KeyManager as far as I can tell. The JmeterKeyStore class does not implement the X509KeyManager interface. Whether it should do is a separate issue; if it were changed, then we would need to look at changing getClientAliases to return null. It's not clear whether X509KeyManager implementations actually treat null as different from an empty array, or whether the Javadoc comment is intended to allow null as well as an empty array. We can do what we like with JmeterKeyStore, so long as we are self-consistent. > return null; > } > > >
