Add synchronized lock to lcm.stop

Also cleraed session in stop() as well as make taskmaster a daemon thread.

1 files changed, 6 insertions, 3 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 85efd00c5..ae51f2fe0 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -163,8 +163,11 @@ abstract class BaseLifecycleManager {
         }
     }
 
-    public void stop() {
-        session.close();
+    public synchronized void stop() {
+        if(session != null) {
+            session.close();
+            session = null;
+        }
         if (taskmaster != null) {
             taskmaster.shutdown();
         }
@@ -174,7 +177,7 @@ abstract class BaseLifecycleManager {
         if (taskmaster == null) {
             Taskmaster.Builder builder = new Taskmaster.Builder();
             builder.setThreadCount(2);
-            builder.shouldBeDaemon(false);
+            builder.shouldBeDaemon(true);
             taskmaster = builder.build();
             taskmaster.start();
         }