fix:condition被执行了两次

blue3xp · Apr 9, 2022 · 0d69547 · 0d69547
1 parent 1c35fd6
commit 0d69547
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...s/cola-component-statemachine/src/main/java/com/alibaba/cola/statemachine/Transition.java b/...s/cola-component-statemachine/src/main/java/com/alibaba/cola/statemachine/Transition.java
@@ -57,7 +57,7 @@ public interface Transition<S, E, C>{
      * @return the target state
      */
 
-    State<S,E,C> transit(C ctx);
+    State<S, E, C> transit(C ctx, boolean checkCondition);
     /**
      * Verify transition correctness
      */

diff --git a/...onent-statemachine/src/main/java/com/alibaba/cola/statemachine/impl/StateMachineImpl.java b/...onent-statemachine/src/main/java/com/alibaba/cola/statemachine/impl/StateMachineImpl.java
@@ -40,7 +40,7 @@ public S fireEvent(S sourceStateId, E event, C ctx) {
             return sourceStateId;
         }
 
-        return transition.transit(ctx).getId();
+        return transition.transit(ctx, false).getId();
     }
 
     private Transition<S, E, C> routeTransition(S sourceStateId, E event, C ctx) {

diff --git a/...mponent-statemachine/src/main/java/com/alibaba/cola/statemachine/impl/TransitionImpl.java b/...mponent-statemachine/src/main/java/com/alibaba/cola/statemachine/impl/TransitionImpl.java
@@ -83,10 +83,10 @@ public void setAction(Action<S, E, C> action) {
     }
 
     @Override
-    public State<S, E, C> transit(C ctx) {
+    public State<S, E, C> transit(C ctx, boolean checkCondition) {
         Debugger.debug("Do transition: "+this);
         this.verify();
-        if(condition == null || condition.isSatisfied(ctx)){
+        if (!checkCondition || condition == null || condition.isSatisfied(ctx)) {
             if(action != null){
                 action.execute(source.getId(), target.getId(), event, ctx);
             }