Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix potential concurrency issue with join pseudostate

Browse Source 
- Change notified flag to volatile which might explain
  some test failures.
- More testing tweaks for #76
This commit is contained in:
Janne Valkealahti
2015-08-08 16:30:24 +01:00
parent 5347ea4dd9
commit 7fc7dd9cac
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java
View File

@@ -73,7 +73,7 @@ public class JoinPseudoState<S, E> extends AbstractPseudoState<S, E> {
private final PseudoState<S, E> pseudoState;
private final List<State<S, E>> track;
private boolean notified = false;
private volatile boolean notified = false;
public JoinTracker(PseudoState<S, E> pseudoState, List<State<S, E>> track) {
this.pseudoState = pseudoState;

6
spring-statemachine-samples/tasks/src/test/java/demo/tasks/TasksTests.java
View File

@@ -63,7 +63,7 @@ public class TasksTests {
public void testRunOnce() throws InterruptedException {
listener.reset(9, 0, 0);
tasks.run();
assertThat(listener.stateChangedLatch.await(6, TimeUnit.SECONDS), is(true));
assertThat(listener.stateChangedLatch.await(8, TimeUnit.SECONDS), is(true));
assertThat(machine.getState().getIds(), contains(States.READY));
Map<Object, Object> variables = machine.getExtendedState().getVariables();
assertThat(variables.size(), is(3));
@@ -73,7 +73,7 @@ public class TasksTests {
public void testRunTwice() throws InterruptedException {
listener.reset(9, 0, 0);
tasks.run();
assertThat(listener.stateChangedLatch.await(6, TimeUnit.SECONDS), is(true));
assertThat(listener.stateChangedLatch.await(8, TimeUnit.SECONDS), is(true));
assertThat(machine.getState().getIds(), contains(States.READY));
Map<Object, Object> variables = machine.getExtendedState().getVariables();
@@ -81,7 +81,7 @@ public class TasksTests {
listener.reset(9, 0, 0);
tasks.run();
assertThat(listener.stateChangedLatch.await(6, TimeUnit.SECONDS), is(true));
assertThat(listener.stateChangedLatch.await(8, TimeUnit.SECONDS), is(true));
assertThat(machine.getState().getIds(), contains(States.READY));
variables = machine.getExtendedState().getVariables();

19
spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.statemachine.zookeeper;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
@@ -551,16 +551,27 @@ public class ZookeeperStateMachineEnsembleTests extends AbstractZookeeperTests {
ensemble.afterPropertiesSet();
ensemble.start();
listener.reset(0, 10, 1);
ensemble.enabled = false;
for (int i = 0; i < 5; i++) {
// this is a bit of a hack to test things like this
// not sure if this is totally reliable way
ensemble.enabled = false;
for (int i = 0; i < 4; i++) {
ensemble.setState(new DefaultStateMachineContext<String, String>("S" + i, "E" + i,
new HashMap<String, Object>(), new DefaultExtendedState()));
}
assertThat(listener.errorLatch.await(2, TimeUnit.SECONDS), is(false));
for (int i = 4; i < 5; i++) {
ensemble.setState(new DefaultStateMachineContext<String, String>("S" + i, "E" + i,
new HashMap<String, Object>(), new DefaultExtendedState()));
}
ensemble.enabled = true;
TestUtils.callMethod("registerWatcherForStatePath", ensemble);
assertThat(listener.errors.size(), is(0));
String reason = "";
if (listener.errors.size() > 0) {
reason = listener.errors.get(0).toString();
}
assertThat(reason, listener.errors.size(), is(0));
for (int i = 5; i < 6; i++) {
ensemble.setState(new DefaultStateMachineContext<String, String>("S" + i, "E" + i,