358581: AbstractCDOView.getObjectsArray gives array with NULLs

https://bugs.eclipse.org/bugs/show_bug.cgi?id=358581

1 files changed, 12 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index a018dfd394..4a29f5c214 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -90,6 +90,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -474,7 +475,17 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi
 
   public synchronized InternalCDOObject[] getObjectsArray()
   {
-    return objects.values().toArray(new InternalCDOObject[objects.size()]);
+    Collection<InternalCDOObject> values = objects.values();
+    List<InternalCDOObject> valuesNoNull = new ArrayList<InternalCDOObject>(values.size());
+    for (Iterator<InternalCDOObject> it = values.iterator(); it.hasNext();)
+    {
+      InternalCDOObject next = it.next();
+      if (next != null)
+      {
+        valuesNoNull.add(next);
+      }
+    }
+    return valuesNoNull.toArray(new InternalCDOObject[valuesNoNull.size()]);
   }
 
   public synchronized CDOResource getResource(String path)