jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1293562 - in /jmeter/trunk: src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java xdocs/changes.xml
Date Sat, 25 Feb 2012 09:48:29 GMT
Author: pmouawad
Date: Sat Feb 25 09:48:29 2012
New Revision: 1293562

URL: http://svn.apache.org/viewvc?rev=1293562&view=rev
Log:
Bug 52762 - Problem with multiples certificates: first index not used until indexes are restarted

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
    jmeter/trunk/xdocs/changes.xml

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=1293562&r1=1293561&r2=1293562&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 Sat Feb 25 09:48:29
2012
@@ -140,7 +140,7 @@ public class JmeterKeyStore {
         if (length == 0) { // i.e. is == null
             return null;
         }
-        return this.names[getNextIndex(length)];
+        return this.names[getIndexAndIncrement(length)];
     }
 
     public int getAliasCount() {
@@ -200,13 +200,17 @@ public class JmeterKeyStore {
         return -1;
     }
 
-    private int getNextIndex(int length) {
+    /**
+     * Gets current index and increment by rolling if index is equal to length
+     * @param length Number of keys to roll
+     */
+    private int getIndexAndIncrement(int length) {
         synchronized(this) {
-            last_user ++;
+            int result = last_user++;
             if (last_user >= length) {
                 last_user = 0;
             }
-            return last_user;
+            return result;
         }
     }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1293562&r1=1293561&r2=1293562&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Feb 25 09:48:29 2012
@@ -107,6 +107,7 @@ When doing replacement of User Defined V
 <li>Bug 52694 - Deadlock in GUI related to non AWT Threads updating GUI</li>
 <li>Bug 52678 - Proxy : When doing replacement of UserDefinedVariables, partial values
should not be substituted</li>
 <li>Bug 52728 - CSV Data Set Config element cannot coexist with BSF Sampler in same
Thread Plan</li>
+<li>Bug 52762 - Problem with multiples certificates: first index not used until indexes
are restarted</li>
 </ul>
 
 <!-- =================== Improvements =================== -->



Mime
View raw message