From 0558c77f417a29ef2ac048a23e5902355deb0672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CJKAST=E2=80=9D?= <julian.kast@live.com>
Date: Thu, 14 Dec 2023 09:54:21 -0500
Subject: [PATCH] close routerServiceMessageEmitter before setting
 routerServiceMessenger to null

---
 .../java/com/smartdevicelink/transport/TransportBroker.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index 8980c15b4f..cc4b0529dc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
@@ -764,10 +764,10 @@ public void removeSession(long sessionId) {
      * Method to shut down RouterServiceMessenger
      */
     private void shutDownRouterServiceMessenger() {
-        routerServiceMessenger = null;
         if (routerServiceMessageEmitter != null) {
             routerServiceMessageEmitter.close();
         }
         routerServiceMessageEmitter = null;
+        routerServiceMessenger = null;
     }
 }