jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1380036 - /jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Date Sun, 02 Sep 2012 19:22:37 GMT
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



Mime
View raw message