Author: sebb
Date: Sun Oct 23 11:05:43 2011
New Revision: 1187864
URL: http://svn.apache.org/viewvc?rev=1187864&view=rev
Log:
Bug 52033 - Allowing multiple certificates (JKS)
Fix synch. bug reported by Philippe Mouawad on dev list
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java?rev=1187864&r1=1187863&r2=1187864&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
Sun Oct 23 11:05:43 2011
@@ -70,9 +70,6 @@ public class JsseSSLManager extends SSLM
private static final int cps;
- //@GuardedBy("this")
- private static int last_user;
-
static {
log.info("Using default SSL protocol: "+DEFAULT_SSL_PROTOCOL);
log.info("SSL session context: "+(SHARED_SESSION_CONTEXT ? "shared" :
"per-thread"));
@@ -281,6 +278,10 @@ public class JsseSSLManager extends SSLM
*
*/
private static class WrappedX509KeyManager implements X509KeyManager {
+
+ //@GuardedBy("this")
+ private int last_user;
+
/**
* The parent X509KeyManager
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
