summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2010-01-18 03:05:55 (EST)
committerCaspar De Groot2010-01-18 03:05:55 (EST)
commit0f2b4f6f447342287deaf0ef68d6b25bfbefcca9 (patch)
tree9a721dc478a09111bc9d02e682d65180a360d03e
parente5fd7290cf9721322b416c985ad4e21e93688bca (diff)
downloadcdo-0f2b4f6f447342287deaf0ef68d6b25bfbefcca9.zip
cdo-0f2b4f6f447342287deaf0ef68d6b25bfbefcca9.tar.gz
cdo-0f2b4f6f447342287deaf0ef68d6b25bfbefcca9.tar.bz2
[299897] Obtain locks before timestamp creation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=299897
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java10
1 files changed, 5 insertions, 5 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 4b1d399..54a2096 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
@@ -251,18 +251,18 @@ public class TransactionCommitContextImpl implements InternalCommitContext
{
monitor.begin(106);
+ adjustMetaRanges();
+ monitor.worked();
+
+ lockObjects();
+
// Could throw an exception
timeStamp = createTimeStamp();
dirtyObjects = new InternalCDORevision[dirtyObjectDeltas.length];
- adjustMetaRanges();
- monitor.worked();
-
adjustTimeStamps();
monitor.worked();
- lockObjects();
-
InternalRepository repository = transaction.getRepository();
computeDirtyObjects(!repository.isSupportingRevisionDeltas(), monitor.fork());