Reset taskmaster on clean()bugfix/restart_taskmaster

1 files changed, 5 insertions, 0 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index 4df572f47..8a8487178 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -162,6 +162,7 @@ abstract class BaseLifecycleManager {
         }
         if (taskmaster != null) {
             taskmaster.shutdown();
+            taskmaster = null;
         }
     }
 
@@ -1111,6 +1112,10 @@ abstract class BaseLifecycleManager {
         if (encryptionLifecycleManager != null) {
             encryptionLifecycleManager.dispose();
         }
+        if (taskmaster != null) {
+            taskmaster.shutdown();
+            taskmaster = null;
+        }
     }
 
     /**