[402371] CDOCompareUtil.compare fails with models that use Containmentdrops/S20130319-0336committers/estepper/emf-compare-proxies

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

1 files changed, 3 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
index 2eab4eaf5c..3ecce96036 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
@@ -130,11 +130,7 @@ public class CommitIntegrityCheck
 
     if (CDOIDUtil.isNull(containerOrResourceID))
     {
-      idOrObject = revision.getResourceID();
-      if (idOrObject != null)
-      {
-        containerOrResourceID = (CDOID)transaction.convertObjectToID(idOrObject);
-      }
+      containerOrResourceID = revision.getResourceID();
     }
 
     return containerOrResourceID;
@@ -182,8 +178,8 @@ public class CommitIntegrityCheck
         // Nothing to be done. (I think...)
 
         // @3
-        CDOID currentResourceID = (CDOID)transaction.convertObjectToID(dirtyRev.getResourceID());
-        CDOID cleanResourceID = (CDOID)transaction.convertObjectToID(cleanRev.getResourceID());
+        CDOID currentResourceID = dirtyRev.getResourceID();
+        CDOID cleanResourceID = cleanRev.getResourceID();
         if (!CDOIDUtil.equals(currentResourceID, cleanResourceID))
         {
           if (currentResourceID != CDOID.NULL)