Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis@composent.com2010-10-24 16:19:48 -0400
committerslewis@composent.com2010-10-24 16:19:48 -0400
commit6441dd44f51db0f801df8bc23f1c2fb279f1dcac (patch)
treed1eb44f78af7484dbdfdf58c539f18d6df499ea2
parent3080b2baef9f0f9f0137d9ed5cedf66570fb3f95 (diff)
downloadorg.eclipse.ecf-6441dd44f51db0f801df8bc23f1c2fb279f1dcac.tar.gz
org.eclipse.ecf-6441dd44f51db0f801df8bc23f1c2fb279f1dcac.tar.xz
org.eclipse.ecf-6441dd44f51db0f801df8bc23f1c2fb279f1dcac.zip
Additions for rsa
-rw-r--r--incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java23
1 files changed, 13 insertions, 10 deletions
diff --git a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
index 2c770f9e0..bd1a3566d 100644
--- a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
+++ b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
@@ -148,6 +148,19 @@ public class Activator implements BundleActivator {
executor.execute(runnable, null);
}
+ private void shutdownLocatorListeners() {
+ synchronized (locatorListeners) {
+ for(IDiscoveryLocator l: locatorListeners.keySet()) {
+ LocatorServiceListener locatorListener = locatorListeners.get(l);
+ if (locatorListener != null) {
+ l.removeServiceListener(locatorListener);
+ locatorListener.close();
+ }
+ }
+ locatorListeners.clear();
+ }
+ }
+
void shutdownLocators() {
Object[] locators = locatorServiceTracker.getServices();
if (locators != null) {
@@ -212,16 +225,6 @@ public class Activator implements BundleActivator {
Activator.instance = null;
}
- private void shutdownLocatorListeners() {
- synchronized (locatorListeners) {
- for(IDiscoveryLocator l: locatorListeners.keySet()) {
- LocatorServiceListener locatorListener = locatorListeners.get(l);
- if (locatorListener != null) locatorListener.close();
- }
- locatorListeners.clear();
- }
- }
-
protected LogService getLogService() {
if (context == null)
return null;

Back to the top