Author: sebb
Date: Tue Feb 9 20:07:58 2010
New Revision: 908191
URL: http://svn.apache.org/viewvc?rev=908191&view=rev
Log:
Thread-safety
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=908191&r1=908190&r2=908191&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Tue Feb 9 20:07:58 2010
@@ -33,6 +33,7 @@
*/
public class ClientPool {
+ //GuardedBy("this")
private static final ArrayList<Object> clients = new ArrayList<Object>();
private static final Map<Object, Object> client_map = new HashMap<Object,
Object>();
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=908191&r1=908190&r2=908191&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Tue Feb 9 20:07:58 2010
@@ -36,6 +36,7 @@
*/
public class InitialContextFactory {
+ //GuardedBy("this")
private static final HashMap<String, Context> MAP = new HashMap<String,
Context>();
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -91,7 +92,7 @@
/**
* clear all the InitialContext objects.
*/
- public static void close() {
+ public synchronized static void close() { // TODO - why is this not used?
Iterator<?> itr = MAP.keySet().iterator();
while (itr.hasNext()) {
Context ctx = MAP.get(itr.next());
@@ -101,6 +102,7 @@
log.error(e.getMessage());
}
}
+ MAP.clear();
log.info("InitialContextFactory.close() called and Context instances
cleaned up");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
