diff options
author | Markus Alexander Kuppe | 2010-11-02 21:03:04 +0000 |
---|---|---|
committer | Markus Alexander Kuppe | 2010-11-02 21:03:04 +0000 |
commit | 18ee637d73af09b8b4fff99f2c7bb1e83a793707 (patch) | |
tree | 504c903cc0cdc72cda529f4fffa401f3fab6393b /compendium/bundles | |
parent | 6d0fe0ecf312ddd9a4c1cb8c75ce2444cfa835a0 (diff) | |
download | org.eclipse.ecf-18ee637d73af09b8b4fff99f2c7bb1e83a793707.tar.gz org.eclipse.ecf-18ee637d73af09b8b4fff99f2c7bb1e83a793707.tar.xz org.eclipse.ecf-18ee637d73af09b8b4fff99f2c7bb1e83a793707.zip |
RESOLVED - bug 277573: [RFC119] Make remote service identifiable in service registry by setting ServicePublication.ENDPOINT_ID
https://bugs.eclipse.org/bugs/show_bug.cgi?id=277573
Diffstat (limited to 'compendium/bundles')
-rw-r--r-- | compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java index 9fb205104..03a78bc14 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java @@ -691,11 +691,15 @@ public class DiscoveredServiceTrackerImpl implements DiscoveredServiceTracker { // make the service identifiable by consumers // especially org.eclipse.ecf.remoteservice.ui.dosgi - final ID endpointId = (ID) rsReference + ID endpointId = (ID) rsReference .getProperty(org.eclipse.ecf.remoteservice.Constants.SERVICE_CONTAINER_ID); + if (endpointId == null) { + endpointId = rsEndpointDescription.getEndpointAsID(); + } final Long serviceId = (Long) rsReference .getProperty(org.eclipse.ecf.remoteservice.Constants.SERVICE_ID); - props.put(ServicePublication.ENDPOINT_ID, endpointId + "#" + serviceId); //$NON-NLS-1$ + props.put(ServicePublication.ENDPOINT_ID, endpointId.toExternalForm() + + "#" + serviceId); //$NON-NLS-1$ // finally add service.imported.configs addImportedConfigsProperties( |