diff options
author | Eike Stepper | 2016-04-17 05:00:14 +0000 |
---|---|---|
committer | Eike Stepper | 2016-04-17 05:00:14 +0000 |
commit | 5890a16b29787b4f04988fc1a30587eefc29e3c8 (patch) | |
tree | a7e3a29d77436942c0de34109c703eb73e33451a /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction | |
parent | bb06d61bf76e5be079ef500a33ce9c74ff998a7d (diff) | |
download | cdo-5890a16b29787b4f04988fc1a30587eefc29e3c8.tar.gz cdo-5890a16b29787b4f04988fc1a30587eefc29e3c8.tar.xz cdo-5890a16b29787b4f04988fc1a30587eefc29e3c8.zip |
[491499] CDOTransaction.postCommit fails to resolve direct resource
https://bugs.eclipse.org/bugs/show_bug.cgi?id=491499
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 7 |
1 files changed, 2 insertions, 5 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 09240f864c..c80de5cabe 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 @@ -3119,7 +3119,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa } Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts = // - super.invalidate(allChangedObjects, allDetachedObjects, deltas, revisionDeltas, detachedObjects); + super.invalidate(allChangedObjects, allDetachedObjects, deltas, revisionDeltas, detachedObjects); if (!allChangedObjects.isEmpty()) { @@ -4051,10 +4051,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa { if (!objects.isEmpty()) { - for (CDOObject object : objects.values()) - { - CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result); - } + CDOStateMachine.INSTANCE.commit(objects, result); } } } |