surround the listConnectedClients with try-catch due to bug in upstream

dkdhub · Apr 27, 2023 · b4ad812 · b4ad812
1 parent 30bab2a
commit b4ad812
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src-java/com/dkdhub/mqtt_broker/AdvancedBroker.java b/src-java/com/dkdhub/mqtt_broker/AdvancedBroker.java
@@ -69,11 +69,15 @@ public void send(String from, String topic, byte[] data, MqttQoS qos, Boolean re
     }
 
     public List<Map<String, ? extends Serializable>> clients() {
-        return m_server.listConnectedClients().parallelStream()
-                .map(cl -> Map.of(
-                        "id", cl.getClientID(),
-                        "address", cl.getAddress(),
-                        "port", cl.getPort()))
-                .collect(Collectors.toUnmodifiableList());
+        try { // FIXME: this `try-catch to be eliminated once fix will be applied in upstream
+            return m_server.listConnectedClients().parallelStream()
+                    .map(cl -> Map.of(
+                            "id", cl.getClientID(),
+                            "address", cl.getAddress(),
+                            "port", cl.getPort()))
+                    .collect(Collectors.toUnmodifiableList());
+        } catch (NullPointerException npe) {
+            return List.of();
+        }
     }
 }