Skip to content

Do not clear state if server assigned a client ID #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harshitsharma635 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Do not clear state if server assigned a client ID #1103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302b92b
Do not clear state if server assigned a client ID
harshitsharma635 May 26, 2026
5b6843d
Do not clear state if server assigned a client ID
harshitsharma635 May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 IBM Corp and others.
* Copyright (c) 2009, 2026 IBM Corp and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
Expand All @@ -19,6 +19,7 @@
* James Sutton - Automatic Reconnect & Offline Buffering
* Jens Reimann - Fix issue #370
* James Sutton - Mqttv5 - Outgoing Topic Aliases
* Harshit Sharma - Fix server Assigned client ID bug
*/
package org.eclipse.paho.mqttv5.client.internal;

Expand Down Expand Up @@ -1058,7 +1059,13 @@ protected void notifyReceivedAck(MqttAck ack) throws MqttException {
int rc = ((MqttConnAck) ack).getReturnCode();
if (rc == 0) {
synchronized (queueLock) {
if (cleanStart) {
// Fix: Don't clear state if server assigned a client ID
// The ConnectActionListener will handle persistence re-initialization
// and clearing after opening with the assigned client ID
MqttConnAck connAck = (MqttConnAck) ack;
Boolean hasAssignedClientId = connAck.getProperties() != null
&& connAck.getProperties().getAssignedClientIdentifier() != null;
if (cleanStart && !hasAssignedClientId) {
clearState();
// Add the connect token back in so that users can be
// notified when connect completes.
Expand Down