[400892] Intern all CDOIDs

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

1 files changed, 15 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
index 8e1c6b7398..e305ff194e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
@@ -36,7 +36,6 @@ import org.eclipse.emf.cdo.internal.common.revision.CDOIDAndVersionImpl;
 import org.eclipse.emf.cdo.spi.common.id.AbstractCDOID;
 import org.eclipse.emf.cdo.spi.common.id.InternalCDOIDObject;
 
-import org.eclipse.net4j.util.ObjectUtil;
 import org.eclipse.net4j.util.UUIDGenerator;
 import org.eclipse.net4j.util.io.ExtendedDataInput;
 import org.eclipse.net4j.util.io.ExtendedDataOutput;
@@ -44,6 +43,8 @@ import org.eclipse.net4j.util.om.trace.ContextTracer;
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Various static methods that may help with CDO {@link CDOID IDs}.
@@ -59,6 +60,11 @@ public final class CDOIDUtil
   {
   }
 
+  public static <V> Map<CDOID, V> createMap()
+  {
+    return new HashMap<CDOID, V>();
+  }
+
   /**
    * @since 4.0
    */
@@ -519,17 +525,22 @@ public final class CDOIDUtil
    */
   public static boolean equals(CDOID id1, CDOID id2)
   {
+    if (id1 == id2)
+    {
+      return true;
+    }
+
     if (id1 == null)
     {
-      id1 = CDOID.NULL;
+      return id2 == CDOID.NULL;
     }
 
     if (id2 == null)
     {
-      id2 = CDOID.NULL;
+      return id1 == CDOID.NULL;
     }
 
-    return ObjectUtil.equals(id1, id2);
+    return false;
   }
 
   /**