Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-12-23 07:06:35 +0000
committerEike Stepper2009-12-23 07:06:35 +0000
commit9c63dd569545bc5039c629ab5f48976850f25550 (patch)
treedc0fcbd7aa7198f027fdaf9e8c67757dd0273267 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal
parent4633b4c4c2f897ec9d52d6e9ef070d6f6f0aba7b (diff)
downloadcdo-9c63dd569545bc5039c629ab5f48976850f25550.tar.gz
cdo-9c63dd569545bc5039c629ab5f48976850f25550.tar.xz
cdo-9c63dd569545bc5039c629ab5f48976850f25550.zip
[296450] isSet method returns incorrect value after load
https://bugs.eclipse.org/bugs/show_bug.cgi?id=296450
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java
index 69c1e3ea10..4e8456ff41 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java
@@ -35,7 +35,7 @@ public class CDOObjectMerger extends CDORevisionMerger
InternalCDORevision revision = (InternalCDORevision)object.cdoRevision().copy();
if (!revision.isTransactional())
{
- revision.setTransactional();
+ revision.setTransactional(true);
}
object.cdoInternalSetRevision(revision);
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 c32678c424..4f74be92f3 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
@@ -764,7 +764,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
revision = (InternalCDORevision)factory.createRevision(eClass);
revision.setID(id);
revision.setVersion(formerRevision.getVersion());
- revision.setTransactional();
+ revision.setTransactional(true);
}
else
{
@@ -858,7 +858,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
// Adjust revision
revision.setID(id);
- revision.setUntransactional();
+ revision.setTransactional(false);
revision.setCreated(data.getTimeStamp());
// if (useDeltas)
@@ -900,7 +900,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
{
// Copy revision
InternalCDORevision revision = (InternalCDORevision)object.cdoRevision().copy();
- revision.setTransactional();
+ revision.setTransactional(true);
object.cdoInternalSetRevision(revision);
InternalCDOView view = object.cdoView();

Back to the top