From f51a1fb5020bd98824063c8c8eb560656af10d76 Mon Sep 17 00:00:00 2001
From: slewis@composent.com
Date: Sun, 31 Oct 2010 08:47:48 -0700
Subject: Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=329161

---
 .../ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java
index a1137d2c3..d2ac1a59f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java
@@ -95,7 +95,9 @@ public class RemoteServiceRegistryImpl implements Serializable {
 		for (int i = 0; i < size; i++) {
 			final String clazz = clazzes[i];
 			final ArrayList services = (ArrayList) publishedServicesByClass.get(clazz);
-			services.remove(serviceReg);
+			// Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=329161
+			if (services != null)
+				services.remove(serviceReg);
 		}
 
 		// Remove the ServiceRegistration from the list of all published
-- 
cgit v1.2.3