1 files changed, 1 insertions, 13 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
index 23a50e5f22..6605ff3fc7 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
  * @version $Rev$ $Date$
  */
 public class CompositeContext {
-    protected final static InheritableThreadLocal<CompositeContext> context = new InheritableThreadLocal<CompositeContext>();
+
     protected ExtensionPointRegistry extensionPointRegistry;
     protected EndpointRegistry endpointRegistry;
     protected ComponentContextFactory componentContextFactory;
@@ -84,10 +84,6 @@ public class CompositeContext {
             RuntimeComponentContext componentContext = component.getComponentContext();
             return componentContext.getCompositeContext();
         }
-        CompositeContext compositeContext = context.get();
-        if (compositeContext != null) {
-            return compositeContext;
-        }
         return null;
     }
 
@@ -124,14 +120,6 @@ public class CompositeContext {
         return domainComposite; 
     }
     
-    public static void setThreadCompositeContext(CompositeContext value) {
-        context.set(value);
-    }
-    
-    public static void removeCompositeContext() {
-        context.remove();
-    }
-
     public String getNodeURI() {
         return nodeURI;
     }