[400892] Intern all CDOIDs

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

3 files changed, 12 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
index fcde4b9393..20502827d1 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDExternal;
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.lob.CDOLobHandler;
 import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea.Handler;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
@@ -92,7 +93,6 @@ import java.io.OutputStream;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -120,7 +120,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
   boolean zipped = true; // TODO - might make this configurable...
 
-  private HashMap<CDOID, ObjyObject> newObjyObjectsMap = new HashMap<CDOID, ObjyObject>();
+  private Map<CDOID, ObjyObject> newObjyObjectsMap = CDOIDUtil.createMap();
 
   private long readRevisionTime = 0;
 
@@ -476,7 +476,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
   /**
    * Called for each revision delta.
-   * 
+   *
    * @param delta
    * @param created
    * @param branch
@@ -583,7 +583,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
   /**
    * Called for each revision delta.
-   * 
+   *
    * @param delta
    * @param created
    * @param branch
@@ -1344,8 +1344,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
   }
 
   /**
-	 *
-	 */
+   *
+   */
   public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
       CDORevisionCacheAdder cache)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
index d0021718d4..721225080e 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.server.internal.objectivity.clustering;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.eresource.EresourcePackage;
 import org.eclipse.emf.cdo.server.internal.objectivity.ObjectivityStore;
 import org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM;
@@ -27,7 +28,6 @@ import org.eclipse.emf.ecore.EClass;
 
 import com.objy.db.app.ooId;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /***
@@ -64,13 +64,13 @@ public class ObjyPlacementManagerLocal
     this.objySession = objySession;
     this.commitContext = commitContext;
     // first put them in a map for easy lookup and processing....
-    newObjectsMap = new HashMap<CDOID, InternalCDORevision>();
+    newObjectsMap = CDOIDUtil.createMap();
     for (InternalCDORevision revision : commitContext.getNewObjects())
     {
       newObjectsMap.put(revision.getID(), revision);
     }
 
-    idMapper = new HashMap<CDOID, CDOID>();
+    idMapper = CDOIDUtil.createMap();
 
     this.newObjyObjectsMap = newObjyObjectsMap;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
index 366d81e7fd..6295db2775 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
@@ -4,13 +4,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Ibrahim Sallam - initial API and implementation
  */
 package org.eclipse.emf.cdo.server.internal.objectivity.schema;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockGrade;
 import org.eclipse.emf.cdo.server.internal.objectivity.utils.OBJYCDOIDUtil;
 
@@ -19,7 +20,6 @@ import com.objy.db.app.ooObj;
 import com.objy.db.util.ooTreeSetX;
 
 import java.text.MessageFormat;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -130,7 +130,7 @@ public class ObjyLockArea extends ooObj
   {
     fetch();
 
-    Map<CDOID, LockGrade> locks = new HashMap<CDOID, LockGrade>();
+    Map<CDOID, LockGrade> locks = CDOIDUtil.createMap();
 
     @SuppressWarnings("rawtypes")
     Iterator itr = readLockSet.iterator();