Check if message is null before releasing message id (#81)

gojek · Dec 8, 2023 · 682de7b · 682de7b
1 parent 8e3c564
commit 682de7b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/paho/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsSender.java b/paho/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsSender.java
@@ -288,7 +288,9 @@ private void handleRunException(MqttWireMessage message, Exception ex)
 		) {
 			clientState.releaseMessageId(message.getMessageId());
 		}
-		clientState.releaseMessageId(message.getType());
+		if (message != null) {
+			clientState.releaseMessageId(message.getType());
+		}
 		running = false;
 
 		clientComms.shutdownConnection(null, mex);