summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2009-12-28 03:52:14 (EST)
committerCaspar De Groot2009-12-28 03:52:14 (EST)
commit538ec5651ad26bedb0e4a7641f5cad80fdce47d8 (patch)
treeda420ba261a6872947f617c2b703a357288f0204
parente5014f1f36217ff68e5fc942167a056f7ac96c7e (diff)
downloadcdo-538ec5651ad26bedb0e4a7641f5cad80fdce47d8.zip
cdo-538ec5651ad26bedb0e4a7641f5cad80fdce47d8.tar.gz
cdo-538ec5651ad26bedb0e4a7641f5cad80fdce47d8.tar.bz2
[295311] Prevent storing duplicate CDOID/CDO_VERSION revisions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=295311
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
index 7fde820..4b1d399 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
@@ -261,10 +261,11 @@ public class TransactionCommitContextImpl implements InternalCommitContext
adjustTimeStamps();
monitor.worked();
+ lockObjects();
+
InternalRepository repository = transaction.getRepository();
computeDirtyObjects(!repository.isSupportingRevisionDeltas(), monitor.fork());
- lockObjects();
monitor.worked();
repository.notifyWriteAccessHandlers(transaction, this, monitor.fork());