1 files changed, 6 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
index 3240b4e50d..0490604fc4 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
@@ -75,7 +75,12 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life
             endpointRegistryURI = "vm://localhost";
         }
         
-        String key = endpointRegistryURI + "," + domainURI;
+        String key;
+        if (endpointRegistryURI.startsWith("tuscany:")){ 
+            key = "tuscany:," + domainURI;
+        } else {
+            key = endpointRegistryURI + "," + domainURI;
+        }
 
         EndpointRegistry endpointRegistry = endpointRegistries.get(key);
         if (endpointRegistry != null) {