1 files changed, 13 insertions, 5 deletions

diff --git a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java
index ba7443449..7e2721824 100644
--- a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java
+++ b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java
@@ -79,6 +79,12 @@ public abstract class AbstractTopologyManager {
 				remoteServiceAdminTracker = null;

 			}

 		}

+		synchronized (exportedRegistrations) {

+			exportedRegistrations.clear();

+		}

+		synchronized (importedRegistrations) {

+			importedRegistrations.clear();

+		}

 		context = null;

 	}

 

@@ -109,7 +115,7 @@ public abstract class AbstractTopologyManager {
 			if (remoteServiceAdminTracker == null) {

 				remoteServiceAdminTracker = new ServiceTracker(getContext(),

 						createRSAFilter(), null);

-				remoteServiceAdminTracker.open(true);

+				remoteServiceAdminTracker.open();

 			}

 		}

 		return (org.osgi.service.remoteserviceadmin.RemoteServiceAdmin) remoteServiceAdminTracker

@@ -376,10 +382,12 @@ public abstract class AbstractTopologyManager {
 			}

 		}

 		// Now close all of them

-		for (org.osgi.service.remoteserviceadmin.ImportRegistration removedReg : removedRegistrations) {

-			trace("unimportService", "closing importRegistration=" + removedReg);

-			removedReg.close();

-		}

+		if (removedRegistrations != null)

+			for (org.osgi.service.remoteserviceadmin.ImportRegistration removedReg : removedRegistrations) {

+				trace("unimportService", "closing importRegistration="

+						+ removedReg);

+				removedReg.close();

+			}

 	}

 

 }