summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-07-04 00:32:43 (EDT)
committerCaspar De Groot2011-07-04 00:32:43 (EDT)
commit3f26368db94429f88afa0ed215f78d5af8ed2781 (patch)
tree2c4c98ad8b000194cd0c879546cb9abc0cb6bb73
parent46a3904f2d97ed3f8371438c1b6f2c9018ce5f80 (diff)
downloadcdo-3f26368db94429f88afa0ed215f78d5af8ed2781.zip
cdo-3f26368db94429f88afa0ed215f78d5af8ed2781.tar.gz
cdo-3f26368db94429f88afa0ed215f78d5af8ed2781.tar.bz2
[Bug 349526] CommitIntegrityCheck should use #equals when comparing OIDs
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349526
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java4
1 files changed, 2 insertions, 2 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 296a402..2ca6aef 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
@@ -165,7 +165,7 @@ public class CommitIntegrityCheck
// @1
CDOID currentContainerID = (CDOID)transaction.convertObjectToID(dirtyRev.getContainerID());
CDOID cleanContainerID = (CDOID)transaction.convertObjectToID(cleanRev.getContainerID());
- if (currentContainerID != cleanContainerID)
+ if (!CDOIDUtil.equals(currentContainerID, cleanContainerID))
{
if (currentContainerID != CDOID.NULL)
{
@@ -184,7 +184,7 @@ public class CommitIntegrityCheck
// @3
CDOID currentResourceID = (CDOID)transaction.convertObjectToID(dirtyRev.getResourceID());
CDOID cleanResourceID = (CDOID)transaction.convertObjectToID(cleanRev.getResourceID());
- if (currentResourceID != cleanResourceID)
+ if (!CDOIDUtil.equals(currentResourceID, cleanResourceID))
{
if (currentResourceID != CDOID.NULL)
{