fix(scenario-engine): Duplicated invocation of scenario callback

TeamKun · Nov 2, 2023 · 6d4e020 · 6d4e020
1 parent 63099c2
commit 6d4e020
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/...aticaScenarioEngine/src/main/java/org/kunlab/scenamatica/scenario/QueuedScenarioImpl.java b/...aticaScenarioEngine/src/main/java/org/kunlab/scenamatica/scenario/QueuedScenarioImpl.java
@@ -49,17 +49,6 @@ public QueuedScenarioImpl(
         this.running = false;
         this.result = result;
         this.finishedAt = System.currentTimeMillis();
-        if (this.callback != null)
-            this.callback.accept(result);
-    }
-
-    @Override
-    public ScenarioResult run() throws TriggerNotFoundException
-    {
-        this.onStart();
-        ScenarioResult result = this.manager.runScenario(this.engine, this.trigger);
-        this.onFinished(result);
-
         if (this.callback != null)
             try
             {
@@ -70,6 +59,15 @@ public ScenarioResult run() throws TriggerNotFoundException
                 this.manager.getRegistry().getExceptionHandler().report(e);
             }
 
+    }
+
+    @Override
+    public ScenarioResult run() throws TriggerNotFoundException
+    {
+        this.onStart();
+        ScenarioResult result = this.manager.runScenario(this.engine, this.trigger);
+        this.onFinished(result);
+
         return result;
     }