简柏林 / thingskit · Commits

Commit f3e52cbd3b1b835c3d4f8de6e384fe13aedf7dee

Authored by Igor Kulikov
2 parents 692f5756 e7c19013

Merge branch 'master' into develop/3.2

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -348,7 +348,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement @@ -348,7 +348,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
348 348
349 private MqttMessage createUnSubAckMessage(int msgId) { 349 private MqttMessage createUnSubAckMessage(int msgId) {
350 MqttFixedHeader mqttFixedHeader = 350 MqttFixedHeader mqttFixedHeader =
351 - new MqttFixedHeader(UNSUBACK, false, AT_LEAST_ONCE, false, 0); 351 + new MqttFixedHeader(UNSUBACK, false, AT_MOST_ONCE, false, 0);
352 MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(msgId); 352 MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(msgId);
353 return new MqttMessage(mqttFixedHeader, mqttMessageIdVariableHeader); 353 return new MqttMessage(mqttFixedHeader, mqttMessageIdVariableHeader);
354 } 354 }
@@ -453,7 +453,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement @@ -453,7 +453,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
453 453
454 private static MqttSubAckMessage createSubAckMessage(Integer msgId, List<Integer> grantedQoSList) { 454 private static MqttSubAckMessage createSubAckMessage(Integer msgId, List<Integer> grantedQoSList) {
455 MqttFixedHeader mqttFixedHeader = 455 MqttFixedHeader mqttFixedHeader =
456 - new MqttFixedHeader(SUBACK, false, AT_LEAST_ONCE, false, 0); 456 + new MqttFixedHeader(SUBACK, false, AT_MOST_ONCE, false, 0);
457 MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(msgId); 457 MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(msgId);
458 MqttSubAckPayload mqttSubAckPayload = new MqttSubAckPayload(grantedQoSList); 458 MqttSubAckPayload mqttSubAckPayload = new MqttSubAckPayload(grantedQoSList);
459 return new MqttSubAckMessage(mqttFixedHeader, mqttMessageIdVariableHeader, mqttSubAckPayload); 459 return new MqttSubAckMessage(mqttFixedHeader, mqttMessageIdVariableHeader, mqttSubAckPayload);
@@ -465,7 +465,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement @@ -465,7 +465,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
465 465
466 public static MqttPubAckMessage createMqttPubAckMsg(int requestId) { 466 public static MqttPubAckMessage createMqttPubAckMsg(int requestId) {
467 MqttFixedHeader mqttFixedHeader = 467 MqttFixedHeader mqttFixedHeader =
468 - new MqttFixedHeader(PUBACK, false, AT_LEAST_ONCE, false, 0); 468 + new MqttFixedHeader(PUBACK, false, AT_MOST_ONCE, false, 0);
469 MqttMessageIdVariableHeader mqttMsgIdVariableHeader = 469 MqttMessageIdVariableHeader mqttMsgIdVariableHeader =
470 MqttMessageIdVariableHeader.from(requestId); 470 MqttMessageIdVariableHeader.from(requestId);
471 return new MqttPubAckMessage(mqttFixedHeader, mqttMsgIdVariableHeader); 471 return new MqttPubAckMessage(mqttFixedHeader, mqttMsgIdVariableHeader);