Skip to content

Commit 6d36f4b

Browse files
author
Ranjan Dasgupta
authored
Merge pull request #944 from marciogranzotto/fix-null-pointer-dev
Fix NullPointerException trying to clear pending messages and flows
2 parents 240f82f + 96de362 commit 6d36f4b

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/ClientState.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,8 +1366,12 @@ public void quiesce(long timeout) {
13661366
// Quiesce time up or inflight messages delivered. Ensure pending delivery
13671367
// vectors are cleared ready for disconnect to be sent as the final flow.
13681368
synchronized (queueLock) {
1369-
pendingMessages.clear();
1370-
pendingFlows.clear();
1369+
if (pendingMessages != null) {
1370+
pendingMessages.clear();
1371+
}
1372+
if (pendingFlows != null) {
1373+
pendingFlows.clear();
1374+
}
13711375
quiescing = false;
13721376
actualInFlight = 0;
13731377
}

0 commit comments

Comments
 (0)