diff options
Diffstat (limited to 'osgi')
| -rw-r--r-- | osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java index 7aaac8519..332bdc2d9 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java @@ -10,6 +10,7 @@ package org.eclipse.ecf.osgi.services.remoteserviceadmin; import java.util.Map; +import java.util.UUID; import org.eclipse.ecf.osgi.services.remoteserviceadmin.AbstractTopologyManager; import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription; @@ -32,7 +33,16 @@ public class TopologyManagerImpl extends AbstractTopologyManager implements Endp } protected String getFrameworkUUID() { - return super.getFrameworkUUID(); + synchronized ("org.osgi.framework.uuid") { //$NON-NLS-1$ + String result = getContext().getProperty("org.osgi.framework.uuid"); //$NON-NLS-1$ + if (result == null) { + UUID newUUID = UUID.randomUUID(); + result = newUUID.toString(); + System.setProperty("org.osgi.framework.uuid", //$NON-NLS-1$ + newUUID.toString()); + } + return result; + } } protected void handleEndpointAdded(org.osgi.service.remoteserviceadmin.EndpointDescription endpoint, |