Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-08-02 14:27:32 +0000
committerEike Stepper2012-08-02 14:27:32 +0000
commitbf984821aa03b2468445c6d79658ef2d989ccd42 (patch)
tree533cdf48c14c89e7276f96736a98bcc7dd4effc7 /plugins/org.eclipse.emf.cdo
parentc1196249c46456276b70ee2579c304ce1d188d7d (diff)
downloadcdo-bf984821aa03b2468445c6d79658ef2d989ccd42.tar.gz
cdo-bf984821aa03b2468445c6d79658ef2d989ccd42.tar.xz
cdo-bf984821aa03b2468445c6d79658ef2d989ccd42.zip
Revert "Transmit detached versions during commit"
Diffstat (limited to 'plugins/org.eclipse.emf.cdo')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index 7cd76b018e..a3d5499caf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -2623,16 +2623,11 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
detachedObjects = filterCommittables(transaction.getDetachedObjects());
List<CDOIDAndVersion> detached = new ArrayList<CDOIDAndVersion>(detachedObjects.size());
- for (Entry<CDOID, CDOObject> entry : detachedObjects.entrySet())
+ for (CDOID id : detachedObjects.keySet())
{
- CDOID id = entry.getKey();
- CDOObject object = entry.getValue();
-
- InternalCDORevision cleanRevision = cleanRevisions.get(object);
- boolean sameBranch = cleanRevision.getBranch() == getBranch();
- int version = sameBranch ? cleanRevision.getVersion() + 1 : CDOBranchVersion.FIRST_VERSION;
-
- detached.add(CDOIDUtil.createIDAndVersion(id, version));
+ // Add "version-less" key.
+ // CDOSessionImpl.reviseRevisions() will call reviseLatest() accordingly.
+ detached.add(CDOIDUtil.createIDAndVersion(id, CDOBranchVersion.UNSPECIFIED_VERSION));
}
dirtyObjects = filterCommittables(transaction.getDirtyObjects());

Back to the top