1 files changed, 2 insertions, 0 deletions
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 65b55452cc..62f18f08e0 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -134,6 +134,7 @@ public class NodeImpl implements Node, Client {
 
                 this.compositeContext =
                     new CompositeContext(manager.registry, endpointRegistry, domainComposite);
+                CompositeContext.setThreadCompositeContext(compositeContext);
             } finally {
                 // Reset the thread context monitor
                 manager.monitorFactory.setContextMonitor(tcm);
@@ -216,6 +217,7 @@ public class NodeImpl implements Node, Client {
             this.compositeContext = null;
             
             ThreadMessageContext.removeMessageContext();
+            CompositeContext.removeCompositeContext();
 
         } catch (ActivationException e) {
             throw new IllegalStateException(e);