[419574] NPE in CDOMergingConflictResolver

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

2 files changed, 14 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index a8df0d93cd..db826a35e9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.impl.EClassImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
@@ -410,6 +411,12 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
     {
       return null;
     }
+
+    @Override
+    public String toString()
+    {
+      return MessageFormat.format("RevisionWithoutID[{0}]", getClassInfo());
+    }
   }
 
   /**
@@ -452,5 +459,11 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
     {
       return null;
     }
+
+    @Override
+    public String toString()
+    {
+      return MessageFormat.format("RevisionWithoutID[{0}, {1}]", getClassInfo(), id);
+    }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
index a95435cca5..65c93e1e9f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
@@ -367,6 +367,6 @@ public class StubCDORevision extends AbstractCDORevision
 
   private String getExceptionMessage()
   {
-    return "Unsupported operation in " + this;
+    return "Unsupported operation in " + getClass().getSimpleName();
   }
 }