From 05d4cf05f1a9612914142f980c7c56a30069b9ed Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sun, 20 Mar 2016 14:04:28 +0000 Subject: [PATCH] Fix zk ensemble join and start - Now checking during a start if curator client is already started, if so handle join manually. Also trying to start client manually. - Fixes #187 --- .../web/src/main/java/demo/web/StateMachineConfig.java | 4 ++-- .../zookeeper/ZookeeperStateMachineEnsemble.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-statemachine-samples/web/src/main/java/demo/web/StateMachineConfig.java b/spring-statemachine-samples/web/src/main/java/demo/web/StateMachineConfig.java index f5f7face..0ea26409 100644 --- a/spring-statemachine-samples/web/src/main/java/demo/web/StateMachineConfig.java +++ b/spring-statemachine-samples/web/src/main/java/demo/web/StateMachineConfig.java @@ -197,11 +197,11 @@ public class StateMachineConfig { } public enum States { - S0, S1, S11, S12, S2, S21, S211, S212 + S0, S1, S11, S12, S2, S21, S211, S212 } public enum Events { - A, B, C, D, E, F, G, H, I, J, K + A, B, C, D, E, F, G, H, I, J, K } private static class FooAction implements Action { diff --git a/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java b/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java index 263d5589..d2b7a09b 100644 --- a/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java +++ b/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java @@ -134,6 +134,11 @@ public class ZookeeperStateMachineEnsemble extends StateMachineEnsembleObj } } curatorClient.getConnectionStateListenable().addListener(connectionListener); + if (curatorClient.getState() == CuratorFrameworkState.STARTED) { + handleZkConnect(); + } else { + curatorClient.start(); + } } @Override