1 files changed, 4 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
index ccea9281df..3a21674139 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
@@ -65,7 +65,10 @@ public class EndpointHelper {
             }
         }
         
-        props.put(RemoteConstants.ENDPOINT_ID, props.get(Constants.SERVICE_ID));
+        String serviceID = (String)props.get(Constants.SERVICE_ID);
+        if (serviceID != null) {
+            props.put(RemoteConstants.ENDPOINT_ID, Long.parseLong(serviceID));
+        }
         props.put(RemoteConstants.ENDPOINT_URI, endpoint.getURI());
         // FIXME: [rfeng] How to pass in the remote service id from the endpoint XML
         props.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, new String[] {"org.osgi.sca"});