From 6441dd44f51db0f801df8bc23f1c2fb279f1dcac Mon Sep 17 00:00:00 2001
From: slewis@composent.com
Date: Sun, 24 Oct 2010 13:19:48 -0700
Subject: Additions for rsa

---
 .../services/remoteserviceadmin/Activator.java     | 23 ++++++++++++----------
 1 file 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;
-- 
cgit v1.2.3