Change the Registry factory to not use the full config uri when its the tuscany: scheme so that the registry itself can control how the registry gets shared amoung nodes. (I think we need to review all the core approach to creating/locating/sharing endpoint registries, I'll start a ML thread about this once I've got something more complete working)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@897142 13f79535-47bb-0310-9956-ffa450edef68

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) {