You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/09 01:52:28 UTC
svn commit: r494280 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core:
EnvProps.java ThreadContext.java
Author: dblevins
Date: Mon Jan 8 16:52:27 2007
New Revision: 494280
URL: http://svn.apache.org/viewvc?view=rev&rev=494280
Log:
removed pluggable concept from the ThreadContext
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java?view=diff&rev=494280&r1=494279&r2=494280
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java Mon Jan 8 16:52:27 2007
@@ -34,8 +34,6 @@
public final static String IM_STRICT_POOLING = "StrictPooling";
- public final static String THREAD_CONTEXT_IMPL = "org/openejb/core/ThreadContext/IMPL_CLASS";
-
/*
* The EJB 1.1 specification requires that arguments and return values between beans adhere to the
* Java RMI copy semantics which requires that the all arguments be passed by value (copied) and
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java?view=diff&rev=494280&r1=494279&r2=494280
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java Mon Jan 8 16:52:27 2007
@@ -16,12 +16,9 @@
*/
package org.apache.openejb.core;
-import org.apache.openejb.ClassLoaderUtil;
-
public class ThreadContext implements Cloneable {
protected static final ThreadLocal<ThreadContext> threadStorage = new ThreadLocal<ThreadContext>();
- protected static Class implClass = ThreadContext.class;
protected boolean valid = false;
protected CoreDeploymentInfo deploymentInfo;
@@ -30,34 +27,6 @@
protected Object securityIdentity;
protected Object unspecified;
- static {
- String className = System.getProperty(EnvProps.THREAD_CONTEXT_IMPL);
-
- if (className == null) {
- className = System.getProperty(EnvProps.THREAD_CONTEXT_IMPL);
- }
-
- if (className != null) {
- try {
- ClassLoader cl = ClassLoaderUtil.getContextClassLoader();
- implClass = Class.forName(className, true, cl);
- } catch (Exception e) {
- System.out.println("Can not load ThreadContext class. org.apache.openejb.core.threadcontext_class = " + className);
- e.printStackTrace();
- implClass = null;
- }
- }
- }
-
- protected static ThreadContext newThreadContext() {
- try {
- return (ThreadContext) implClass.newInstance();
- } catch (Exception e) {
-
- e.printStackTrace();
- throw new RuntimeException("ThreadContext implemenation class could not be instantiated. Class type = " + implClass + " exception message = " + e.getMessage());
- }
- }
public static boolean isValid() {
ThreadContext tc = threadStorage.get();
@@ -94,7 +63,7 @@
public static ThreadContext getThreadContext() {
ThreadContext tc = threadStorage.get();
if (tc == null) {
- tc = ThreadContext.newThreadContext();
+ tc = new ThreadContext();
threadStorage.set(tc);
}
return tc;