summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-01-19 04:51:38 (EST)
committerEike Stepper2008-01-19 04:51:38 (EST)
commit0832bbc5a5a441a4b48de13832ad2ad450a4e0e5 (patch)
tree3f46d91cdbf2993dd0c200fb34e421d0f2aa56d0
parent144506ef94ddd04cd485402c7cacab12abbbf0a4 (diff)
downloadcdo-0832bbc5a5a441a4b48de13832ad2ad450a4e0e5.zip
cdo-0832bbc5a5a441a4b48de13832ad2ad450a4e0e5.tar.gz
cdo-0832bbc5a5a441a4b48de13832ad2ad450a4e0e5.tar.bz2
[214752] Concurrency problem with getRevision()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=214752
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
index 02891d7..96a5c68 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
@@ -66,9 +66,9 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
storeTransaction.execute(new AddRevisionOperation(revision));
}
- public void writeRevisionDelta(ITransaction<IStoreWriter> storeTransaction, CDORevisionDeltaImpl revision)
+ public void addRevisionDelta(ITransaction<IStoreWriter> storeTransaction, CDORevisionDeltaImpl delta)
{
- storeTransaction.execute(new WriteRevisionOperation(revision));
+ storeTransaction.execute(new AddRevisionDeltaOperation(delta));
}
public CDOID resolveReferenceProxy(CDOReferenceProxy referenceProxy)
@@ -302,13 +302,13 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
/**
* @author Simon McDuff
*/
- private final class WriteRevisionOperation implements ITransactionalOperation<IStoreWriter>
+ private final class AddRevisionDeltaOperation implements ITransactionalOperation<IStoreWriter>
{
private CDORevisionDeltaImpl revisionDelta;
private CDORevisionImpl dirtyRevision = null;
- private WriteRevisionOperation(CDORevisionDeltaImpl revisionDelta)
+ private AddRevisionDeltaOperation(CDORevisionDeltaImpl revisionDelta)
{
this.revisionDelta = revisionDelta;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index 89c7d2a..2bd17a5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -283,7 +283,7 @@ public class CommitTransactionIndication extends CDOServerIndication
for (CDORevisionDeltaImpl delta : deltas)
{
delta.adjustReferences(idMappings);
- getRevisionManager().writeRevisionDelta(storeTransaction, delta);
+ getRevisionManager().addRevisionDelta(storeTransaction, delta);
}
}