1 files changed, 7 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
index 4688bea66f..0b6b93edc0 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
@@ -93,7 +93,13 @@ public abstract class BaseEndpointRegistry implements EndpointRegistry, LifeCycl
 
         if (endpointReference.getReference() != null) {
             Endpoint targetEndpoint = endpointReference.getTargetEndpoint();
-            return findEndpoint(targetEndpoint.getURI());
+            String uri = targetEndpoint.getURI();
+            // [rfeng] This is a workaround to deal with the case that the endpoint URI doesn't have the 
+            // service name to avoid confusion between structural URIs and service URIs
+            if (uri.indexOf('#') == -1) {
+                uri = uri + "#service()";
+            }
+            return findEndpoint(uri);
         }
 
         return new ArrayList<Endpoint>();