From 9b6ba3d08687a0d99664695d12b16c2663265194 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Tue, 20 Jan 2015 16:15:56 +0100
Subject: [PATCH] Refactored Executor reset function

---
 .../java/com/ericsson/uecontrol/core/UeBehaviour.java     | 1 -
 .../com/ericsson/uecontrol/core/UeControlExecutor.java    | 3 +--
 .../ericsson/uecontrol/core/logic/UeBehaviourStop.java    | 8 +++++---
 .../java/com/ericsson/uecontrol/gui/MainActivity.java     | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeBehaviour.java b/app/src/main/java/com/ericsson/uecontrol/core/UeBehaviour.java
index 0e3a035..642cde1 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeBehaviour.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeBehaviour.java
@@ -53,7 +53,6 @@ public abstract class UeBehaviour implements Serializable{
     }
 
     public void reset(){
-        terminate();
         execTime = -1;
     }
 
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
index 1203fed..05990bb 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
@@ -113,7 +113,6 @@ public class UeControlExecutor implements Runnable{
     }
 
     public synchronized void reset(){
-        terminateNonBlock();
         currentlyActive = null;
         for(int i=0; i<behaviours.size(); i++){
             behaviours.get(i).reset();
@@ -150,7 +149,7 @@ public class UeControlExecutor implements Runnable{
 
             // Run behaviour
             UeBehaviour execBehaviour = currentlyActive;
-            log.info("Running behaviour: " + currentlyActive.getName());
+            log.info("Running behaviour: " + execBehaviour.getName());
             execBehaviour.run(this);
 
             // Before deciding on the next behaviour check if currentlyActive
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/logic/UeBehaviourStop.java b/app/src/main/java/com/ericsson/uecontrol/core/logic/UeBehaviourStop.java
index 42a428b..17ef413 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/logic/UeBehaviourStop.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/logic/UeBehaviourStop.java
@@ -1,6 +1,7 @@
 package com.ericsson.uecontrol.core.logic;
 
 import com.ericsson.uecontrol.core.UeBehaviour;
+import com.ericsson.uecontrol.core.UeControlExecutor;
 import com.ericsson.uecontrol.core.util.Configurator.Configurable;
 import org.apache.log4j.Logger;
 
@@ -13,10 +14,11 @@ public class UeBehaviourStop extends UeBehaviour {
 
     @Override
     protected void execute() throws Exception {
-        log.debug("Terminating execution");
-        super.getExecutor().setNextBehaviour(0);
+        UeControlExecutor executor = super.getExecutor();
+        log.debug("Terminating executor");
+        executor.terminateNonBlock();
         log.debug("Resetting executor");
-        super.getExecutor().reset();
+        executor.reset();
         Thread.sleep(VISUAL_SLEEP_PERIOD); // Sleep as a visual queue
     }
 
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index eb9db36..5977166 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -191,8 +191,10 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
             }
         }
         else if (id == R.id.action_reset) {
-            if(executor != null)
+            if(executor != null) {
+                executor.terminate();
                 executor.reset();
+            }
             if(statusFragment != null)
                 statusFragment.reset();
             if(behaviourListFragment != null)