Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorslewis2016-11-13 19:30:23 -0500
committerslewis2016-11-13 19:30:23 -0500
commit85613c8ec3473d4624e20cb53751f98e0831e289 (patch)
tree4059cdb0de2d13b0db5aadad646adab1b55c59a7 /osgi
parent12c86a1e2969957d54a699f97e5c265e5d20622a (diff)
downloadorg.eclipse.ecf-85613c8ec3473d4624e20cb53751f98e0831e289.tar.gz
org.eclipse.ecf-85613c8ec3473d4624e20cb53751f98e0831e289.tar.xz
org.eclipse.ecf-85613c8ec3473d4624e20cb53751f98e0831e289.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=507444
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
index 1a21ac654..b67d6dd32 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
@@ -1229,8 +1229,12 @@ public class RemoteServiceAdmin implements
}
public synchronized long getRemoteServiceId() {
- EndpointDescription ed = getEndpointDescription();
- return (ed == null)?0:ed.getRemoteServiceId();
+ if (importEndpoint == null)
+ return 0;
+ IRemoteServiceReference ref = importEndpoint.rsReference;
+ if (ref == null)
+ return 0;
+ return ref.getID().getContainerRelativeID();
}
public synchronized ServiceReference getImportedService() {

Back to the top