diff options
author | Eike Stepper | 2010-06-29 14:42:48 +0000 |
---|---|---|
committer | Eike Stepper | 2010-06-29 14:42:48 +0000 |
commit | a3abcc8ca92a68dcc3763f70a8dc3e838bcd695e (patch) | |
tree | 4c5796d686410113dec6fec1123c2925b313d182 /plugins | |
parent | 57e96009a4274c1e4b472b55c16bc8b56ded5a93 (diff) | |
download | cdo-a3abcc8ca92a68dcc3763f70a8dc3e838bcd695e.tar.gz cdo-a3abcc8ca92a68dcc3763f70a8dc3e838bcd695e.tar.xz cdo-a3abcc8ca92a68dcc3763f70a8dc3e838bcd695e.zip |
[309305] Transition TRANSIENT with Event INVALIDATE/DETACH_REMOTE not supported
https://bugs.eclipse.org/bugs/show_bug.cgi?id=309305
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java | 11 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java index 75696765a0..4549f0c39f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java @@ -134,15 +134,8 @@ public class StateMachineTest extends AbstractCDOTest Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); assertTransient(supplier); - try - { - invalidate(supplier); - fail("IllegalStateException expected"); - } - catch (IllegalStateException expected) - { - assertFailure(expected); - } + invalidate(supplier); + assertTransient(supplier); } public void test_TRANSIENT_with_COMMIT() throws Exception 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 187649adba..14a0ca3899 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 @@ -79,8 +79,8 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent init(CDOState.TRANSIENT, CDOEvent.REATTACH, new ReattachTransition()); init(CDOState.TRANSIENT, CDOEvent.READ, IGNORE); init(CDOState.TRANSIENT, CDOEvent.WRITE, IGNORE); - init(CDOState.TRANSIENT, CDOEvent.INVALIDATE, FAIL); - init(CDOState.TRANSIENT, CDOEvent.DETACH_REMOTE, FAIL); + init(CDOState.TRANSIENT, CDOEvent.INVALIDATE, IGNORE); + init(CDOState.TRANSIENT, CDOEvent.DETACH_REMOTE, IGNORE); init(CDOState.TRANSIENT, CDOEvent.COMMIT, FAIL); init(CDOState.TRANSIENT, CDOEvent.ROLLBACK, FAIL); |