aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index ae85af6ae9..4c033ef0cb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -289,6 +289,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
// Adjust revision
CDORevisionImpl revision = (CDORevisionImpl)object.cdoRevision();
revision.setID(id);
+ revision.setUntransactional();
revision.setCreated(data.getTimeStamp());
revision.adjustReferences(idMappings);
view.getSession().getRevisionManager().addRevision(revision);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
index 72edec240b..1e10c73204 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
@@ -69,6 +69,11 @@ public class LoadChunkRequest extends CDOClientRequest<CDOID>
CDOIDImpl.write(out, id);
int version = revision.getVersion();
+ if (revision.isTransactional())
+ {
+ --version;
+ }
+
if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing revision version: {0}", version);
out.writeInt(version);