diff options
| author | Eike Stepper | 2009-11-12 18:11:26 +0000 |
|---|---|---|
| committer | Eike Stepper | 2009-11-12 18:11:26 +0000 |
| commit | 206fbd6997c52ca66c9c0867f1f9a9d0e5cdaac7 (patch) | |
| tree | 6ea05718b8a1fa61943257864e9165667100bba2 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo | |
| parent | 4947f2f61343a57790c1b68f82b9d1ef6f9ec577 (diff) | |
| download | cdo-206fbd6997c52ca66c9c0867f1f9a9d0e5cdaac7.tar.gz cdo-206fbd6997c52ca66c9c0867f1f9a9d0e5cdaac7.tar.xz cdo-206fbd6997c52ca66c9c0867f1f9a9d0e5cdaac7.zip | |
[294998] Deltas for local changes to objects in CONFLICT state, are not added to tx
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294998
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java | 2 |
1 files changed, 1 insertions, 1 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 b1ae04f4eb..c32678c424 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 @@ -148,7 +148,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent init(CDOState.CONFLICT, CDOEvent.ATTACH, IGNORE); init(CDOState.CONFLICT, CDOEvent.DETACH, new DetachTransition()); init(CDOState.CONFLICT, CDOEvent.READ, IGNORE); - init(CDOState.CONFLICT, CDOEvent.WRITE, IGNORE); + init(CDOState.CONFLICT, CDOEvent.WRITE, new RewriteTransition()); init(CDOState.CONFLICT, CDOEvent.INVALIDATE, IGNORE); init(CDOState.CONFLICT, CDOEvent.DETACH_REMOTE, IGNORE); init(CDOState.CONFLICT, CDOEvent.RELOAD, FAIL); |