From 98e7b0bb0fff8a44240b985a9793ee503b6f18a2 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jan 2010 15:09:16 +0000 Subject: Some more temporary hardcoding in the default registry factory, will be removed when we clean all this up git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904120 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/core/runtime/DefaultDomainRegistryFactory.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'sca-java-2.x/trunk') 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 9ee7934b1e..8bd5df8386 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 @@ -76,7 +76,7 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life } String key; - if (endpointRegistryURI.startsWith("tuscany:")){ + if (endpointRegistryURI.startsWith("tuscany:") || endpointRegistryURI.startsWith("tuscanyClient:")){ key = "tuscany:," + domainURI; } else { key = endpointRegistryURI + "," + domainURI; @@ -92,9 +92,13 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life if (endpointRegistry != null) { return endpointRegistry; } + // see if its a tuscany: one (TODO: need to clean all this up) + endpointRegistry = endpointRegistries.get(domainURI + "," + domainURI); + if (endpointRegistry != null) { + return endpointRegistry; + } - URI uri = URI.create(endpointRegistryURI); - String scheme = uri.getScheme(); + String scheme = "tuscanyClient:".equals(endpointRegistryURI) ? "tuscanyClient" : URI.create(endpointRegistryURI).getScheme(); if (scheme != null) { scheme = scheme.toLowerCase(); } else { @@ -130,7 +134,9 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life for (EndpointListener listener : listeners) { endpointRegistry.addListener(listener); } - endpointRegistries.put(key, endpointRegistry); + if (!"tuscanyClient:".equals(endpointRegistryURI)) { + endpointRegistries.put(key, endpointRegistry); + } return endpointRegistry; } -- cgit v1.2.3