Reinserted route to qo0 branch in publish2Subscribers for internal publish

This commit is contained in:
andsel
2016-12-13 23:43:02 +01:00
parent 12ed805737
commit 81a447dce9
@@ -622,17 +622,22 @@ public class ProtocolProcessor {
LOG.debug("Broker republishing to client <{}> topic <{}> qos <{}>, active {}", LOG.debug("Broker republishing to client <{}> topic <{}> qos <{}>, active {}",
sub.getClientId(), sub.getTopicFilter(), qos, targetIsActive); sub.getClientId(), sub.getTopicFilter(), qos, targetIsActive);
ByteBuffer message = origMessage.duplicate(); ByteBuffer message = origMessage.duplicate();
//QoS 1 or 2 if (qos == AbstractMessage.QOSType.MOST_ONE && targetIsActive) {
//if the target subscription is not clean session and is not connected => store it //QoS 0
if (!targetSession.isCleanSession() && !targetIsActive) { directSend(targetSession, topic, qos, message, false, null);
//store the message in targetSession queue to deliver } else {
targetSession.enqueueToDeliver(guid); //QoS 1 or 2
} else { //if the target subscription is not clean session and is not connected => store it
//publish if (!targetSession.isCleanSession() && !targetIsActive) {
if (targetIsActive) { //store the message in targetSession queue to deliver
int messageId = targetSession.nextPacketId(); targetSession.enqueueToDeliver(guid);
targetSession.inFlightAckWaiting(guid, messageId); } else {
directSend(targetSession, topic, qos, message, false, messageId); //publish
if (targetIsActive) {
int messageId = targetSession.nextPacketId();
targetSession.inFlightAckWaiting(guid, messageId);
directSend(targetSession, topic, qos, message, false, messageId);
}
} }
} }
} }