1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
index ea16adbb14..7102a08c6c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
@@ -317,10 +317,13 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
       public void visit(CDOClearFeatureDelta delta)
       {
         // TODO Only for reference features?
-        CDOList list = newCleanRevision.getList(delta.getFeature());
-        for (Object id : list)
+        CDOList list = newCleanRevision.getListOrNull(delta.getFeature());
+        if (list != null)
         {
-          recurse(detachedObjectsUpdater, (CDOID)id);
+          for (Object id : list)
+          {
+            recurse(detachedObjectsUpdater, (CDOID)id);
+          }
         }
       }