summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-16 03:58:32 (EDT)
committerEike Stepper2007-09-16 03:58:32 (EDT)
commite780da7bc871d8a4ab7f925f01e90479386e75cb (patch)
tree83601400c0b0e0aa0ee956ff789977f2061f922a
parent43f330002d71b89318a74f3340964b1fc35edff9 (diff)
downloadcdo-e780da7bc871d8a4ab7f925f01e90479386e75cb.zip
cdo-e780da7bc871d8a4ab7f925f01e90479386e75cb.tar.gz
cdo-e780da7bc871d8a4ab7f925f01e90479386e75cb.tar.bz2
[203528] LookAhead problem with temporary
https://bugs.eclipse.org/bugs/show_bug.cgi?id=203528
-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 ae85af6..4c033ef 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 72edec2..1e10c73 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);