100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor update for MqttBrokerService.java close connection logic to avoid NPE
Rich Turnerec8f491e8566
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex de147e54e..e7eb65860 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -336,9 +336,15 @@ public class MqttBrokerService extends RouteBuilder implements ContainerService,try {Method closeMethod = session.getClass().getDeclaredMethod("closeImmediately");closeMethod.setAccessible(true);+ Field connectionField = session.getClass().getDeclaredField("mqttConnection");+ connectionField.setAccessible(true);Method disconnectMethod = session.getClass().getDeclaredMethod("disconnect");disconnectMethod.setAccessible(true);- closeMethod.invoke(session);++ Object sessionConnection = connectionField.get(session);+ if (sessionConnection != null) {+ closeMethod.invoke(session);+ }disconnectMethod.invoke(session);} catch (Exception e) {LOG.log(Level.WARNING, "Failed to force disconnect Moquette session using reflection", e);