Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-11-01 10:54:10 -0400
committerMarkus Alexander Kuppe2010-11-01 10:54:10 -0400
commite813f664b340a36718d6d7a9c64b1c2d4b4eb6a7 (patch)
tree6030d06b7734f6ca02f2bc5c51ee55ff58d4781e
parent7084f69681a6527b4fbeb1eb22afcc658b59279c (diff)
parentf51a1fb5020bd98824063c8c8eb560656af10d76 (diff)
downloadorg.eclipse.ecf-e813f664b340a36718d6d7a9c64b1c2d4b4eb6a7.tar.gz
org.eclipse.ecf-e813f664b340a36718d6d7a9c64b1c2d4b4eb6a7.tar.xz
org.eclipse.ecf-e813f664b340a36718d6d7a9c64b1c2d4b4eb6a7.zip
Merge branch 'master' into Release_3_4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java4
1 files changed, 3 insertions, 1 deletions
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

Back to the top