1 files changed, 4 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 65af22c3e7..e25bd4206b 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
@@ -269,7 +269,10 @@ public class EndpointImpl implements Endpoint {
                 names[2] = parts[1];
             } else if (str.startsWith("service(") && str.endsWith(")")) {
                 str = str.substring("service(".length(), str.length() - 1);
-                names[1] = str;
+                // [rfeng] Deal with empty service name
+                if (!"".equals(str)) {
+                    names[1] = str;
+                }
             } else {
                 throw new IllegalArgumentException("Invalid structural URI: " + structuralURI);
             }