sebb 2004/10/23 18:41:32
Modified: src/core/org/apache/jmeter/threads Tag: rel-2_0
JMeterContextService.java
Log:
Remove unused instance; use ThreadLocal instead of HashMap
Revision Changes Path
No revision
No revision
1.7.2.1 +9 -36
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java
Index: JMeterContextService.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- JMeterContextService.java 13 Feb 2004 02:21:39 -0000 1.7
+++ JMeterContextService.java 24 Oct 2004 01:41:32 -0000 1.7.2.1
@@ -19,8 +19,6 @@
package org.apache.jmeter.threads;
import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
/**
* @author Thad Smith
@@ -28,10 +26,12 @@
*/
public final class JMeterContextService implements Serializable
{
- static private JMeterContextService _instance = null;
- static private Map contextMap = new HashMap();
-
-//TODO: consider using ThreadLocal instead?
+ static private ThreadLocal threadContext = new ThreadLocal(){
+ public Object initialValue()
+ {
+ return new JMeterContext();
+ }
+ };
/**
* Private constructor to prevent instantiation.
@@ -40,36 +40,9 @@
{
}
- static private void init()
- {
- if (_instance == null)
- {
- _instance = new JMeterContextService();
- }
- }
-
static public JMeterContext getContext()
{
-
- init();
-
- JMeterContext context =
- (JMeterContext) contextMap.get(Thread.currentThread().getName());
-
- if (context == null)
- {
- context = new JMeterContext();
- setContext(context);
- }
-
- return context;
+ return (JMeterContext) threadContext.get();
}
-
- static void setContext(JMeterContext context)
- {
- init();
- contextMap.put(Thread.currentThread().getName(), context);
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
