1 files changed, 10 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
index 0a0b503206..62ba7cce8d 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
@@ -64,6 +64,16 @@ public class ExtensibleDomainRegistry implements DomainRegistryFactory {
         URI uri = URI.create(endpointRegistryURI);
         String scheme = uri.getScheme();
         if (scheme == null) {
+            
+            // See if there is a previously created registry for that domain
+            for (DomainRegistryFactory factory : factories.getDomainRegistryFactories()) {
+                for (EndpointRegistry endpointRegistry : factory.getEndpointRegistries()) {
+                    if (endpointRegistry.getDomainName().equals(domainURI)) {
+                        return endpointRegistry;
+                    }
+                }
+            }
+
             scheme = "vm";
             endpointRegistryURI = "vm:" + endpointRegistryURI;
         } else {