Clear static instance on ERROR statebugfix/issue_427

1 files changed, 10 insertions, 0 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index b4fea0e71..2d3725e76 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
@@ -146,6 +146,8 @@ public class MultiplexBluetoothTransport {
     protected synchronized void setStateManually(int state){
         //Log.d(TAG, "Setting state from: " +mState + " to: " +state);
         mState = state;
+
+        clearInstanceOnError(state);
     }
     /**
      * Set the current state of the chat connection
@@ -159,6 +161,14 @@ public class MultiplexBluetoothTransport {
         // Give the new state to the Handler so the UI Activity can update
         //Also sending the previous state so we know if we lost a connection
         mHandler.obtainMessage(SdlRouterService.MESSAGE_STATE_CHANGE, state, previousState).sendToTarget();
+
+        clearInstanceOnError(state);
+    }
+
+    private void clearInstanceOnError(int state){
+        if(state == STATE_ERROR){
+            serverInstance = null;
+        }
     }
 
     /**