Skip to content

Fix bug #994 - manualAcks for QoS 2 messages #995

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix bug #994 - manualAcks for QoS 2 messages #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 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
Expand Up @@ -1143,12 +1143,20 @@ protected void handleInboundPubRel(MqttPubRel pubRel) throws MqttException {
new Object[] { pubRel.getMessageId(), pubRel.toString(), pubRel.getReasonCodes()[0] });
throw new MqttException(pubRel.getReasonCodes()[0]);
} else {
// Currently this client has no need of the properties, so this is left empty.
MqttPubComp pubComp = new MqttPubComp(MqttReturnCode.RETURN_CODE_SUCCESS, pubRel.getMessageId(),
new MqttProperties());
// @TRACE 668=Creating MqttPubComp: {0}
log.info(CLASS_NAME, methodName, "668", new Object[] { pubComp.toString() });
this.send(pubComp, null);
MqttPublish sendMsg = (MqttPublish) inboundQoS2.get(Integer.valueOf(pubRel.getMessageId()));
if (sendMsg != null) {
if (callback != null) {
callback.messageArrived(sendMsg);
}
} else {
// Original publish has already been delivered.
// Currently this client has no need of the properties, so this is left empty.
MqttPubComp pubComp = new MqttPubComp(MqttReturnCode.RETURN_CODE_SUCCESS,
pubRel.getMessageId(), new MqttProperties());
// @TRACE 668=Creating MqttPubComp: {0}
log.info(CLASS_NAME, methodName, "668", new Object[] { pubComp.toString() });
this.send(pubComp, null);
}
}
}

Expand Down Expand Up @@ -1219,9 +1227,6 @@ protected void notifyReceivedMsg(MqttWireMessage message) throws MqttException {
case 2:
persistence.put(getReceivedPersistenceKey(message), (MqttPublish) message);
inboundQoS2.put(Integer.valueOf(send.getMessageId()), send);
if (callback != null) {
callback.messageArrived(send);
}
// Currently this client has no need of the properties, so this is left empty.
this.send(new MqttPubRec(MqttReturnCode.RETURN_CODE_SUCCESS, send.getMessageId(),
new MqttProperties()), null);
Expand Down
15 changes: 11 additions & 4 deletions ...ho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,10 +481,17 @@ private void handleMessage(MqttPublish publishMessage) throws Exception {
deliverMessage(destName, publishMessage.getMessageId(), publishMessage.getMessage());

// If we are not in manual ACK mode:
if (!this.manualAcks && publishMessage.getMessage().getQos() == 1) {
this.clientComms.internalSend(new MqttPubAck(MqttReturnCode.RETURN_CODE_SUCCESS,
publishMessage.getMessageId(), new MqttProperties()),
new MqttToken(clientComms.getClient().getClientId()));
if (!this.manualAcks) {
if (publishMessage.getMessage().getQos() == 1) {
this.clientComms.internalSend(new MqttPubAck(MqttReturnCode.RETURN_CODE_SUCCESS,
publishMessage.getMessageId(), new MqttProperties()),
new MqttToken(clientComms.getClient().getClientId()));
} else if (publishMessage.getMessage().getQos() == 2) {
this.clientComms.deliveryComplete(publishMessage.getMessageId());
MqttPubComp pubComp = new MqttPubComp(MqttReturnCode.RETURN_CODE_SUCCESS,
publishMessage.getMessageId(), new MqttProperties());
this.clientComms.internalSend(pubComp, new MqttToken(clientComms.getClient().getClientId()));
}
}
}

Expand Down