Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=327919

1 files changed, 29 insertions, 9 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
index 6f13ba37f..3e814bff9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
@@ -173,12 +173,22 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
 	public void dispose(ID containerID) {
 		super.dispose(containerID);
 		unregisterAllServiceRegistrations();
-		remoteRegistrys.clear();
-		serviceListeners.clear();
-		localServiceRegistrations.clear();
-		addRegistrationRequests.clear();
-		requests.clear();
-		pendingUpdateContainers.clear();
+		synchronized (remoteRegistrys) {
+			remoteRegistrys.clear();
+			localServiceRegistrations.clear();
+		}
+		synchronized (serviceListeners) {
+			serviceListeners.clear();
+		}
+		synchronized (addRegistrationRequests) {
+			addRegistrationRequests.clear();
+		}
+		synchronized (requests) {
+			requests.clear();
+		}
+		synchronized (pendingUpdateContainers) {
+			pendingUpdateContainers.clear();
+		}
 		synchronized (rsQueueLock) {
 			if (rsListenerDispatchEventManager != null) {
 				rsListenerDispatchEventManager.close();
@@ -1061,11 +1071,17 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
 			return;
 		if (requestId == null)
 			return;
-		AddRegistrationRequest request = (AddRegistrationRequest) addRegistrationRequests.get(requestId);
+		AddRegistrationRequest request = removeAddRegistrationRequest(requestId);
 		if (request != null)
 			request.notifyResponse(exception);
 	}
 
+	private AddRegistrationRequest removeAddRegistrationRequest(Integer requestId) {
+		synchronized (addRegistrationRequests) {
+			return (AddRegistrationRequest) addRegistrationRequests.remove(requestId);
+		}
+	}
+
 	/**
 	 * @since 3.2
 	 */
@@ -1515,7 +1531,9 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
 	 * @since 3.2
 	 */
 	protected boolean addRequest(Request request) {
-		return requests.add(request);
+		synchronized (requests) {
+			return requests.add(request);
+		}
 	}
 
 	/**
@@ -1538,7 +1556,9 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
 	 * @since 3.2
 	 */
 	protected boolean removeRequest(Request request) {
-		return requests.remove(request);
+		synchronized (requests) {
+			return requests.remove(request);
+		}
 	}
 
 	protected void logException(int code, String message, Throwable e) {