2 files changed, 8 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
index c3cfdc791c..d32afb2acb 100644
--- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
@@ -93,8 +93,14 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
         this.proxyFactory = ExtensibleProxyFactory.getInstance(extensionsRegistry);
 
         String client = "sca.client." + UUID.randomUUID();
+
         this.compositeContext =
-            new CompositeContext(extensionsRegistry, endpointRegistry, null, domainURI.toString(), client);
+            new CompositeContext(extensionsRegistry, 
+                                 endpointRegistry, 
+                                 null, 
+                                 domainURI.toString(), 
+                                 client, 
+                                 this.nodeFactory.getDeployer().getSystemDefinitions());
     }   
     
     @Override
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
index 6c4f1bacb8..86bdef8380 100644
--- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
+++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
@@ -91,7 +91,7 @@ public class SCAClientHandler implements InvocationHandler {
 
             String client = "sca.client." + UUID.randomUUID();
             CompositeContext compositeContext =
-                new CompositeContext(extensionsRegistry, endpointRegistry, null, domainURI.toString(), client);
+                new CompositeContext(extensionsRegistry, endpointRegistry, null, domainURI.toString(), client, null);
 
             List<Endpoint> eps = endpointRegistry.findEndpoint(serviceName);
             if (eps == null || eps.size() < 1) {