anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused argument

Browse Source
This commit is contained in:
andsel
2016-12-13 23:43:02 +01:00
parent 0e0afe7c9b
commit 0bfdc88e21
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java
+1 -1
View File
@@ -63,7 +63,7 @@ class MetaPublisher {
//QoS 1 or 2 //QoS 1 or 2
int messageId = targetSession.nextPacketId(); int messageId = targetSession.nextPacketId();
targetSession.inFlightAckWaiting(guid, messageId); targetSession.inFlightAckWaiting(guid, messageId);
this.persistentSender.publishQos2(targetSession, topic, qos, message, false, messageId); this.persistentSender.publishQos2(targetSession, topic, qos, message, messageId);
} }
} else { } else {
if (!targetSession.isCleanSession()) { if (!targetSession.isCleanSession()) {
broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
+3 -8
View File
@@ -21,12 +21,12 @@ class PersistentQueueMessageSender {
} }
void publishQos2(ClientSession clientsession, String topic, AbstractMessage.QOSType qos, void publishQos2(ClientSession clientsession, String topic, AbstractMessage.QOSType qos,
ByteBuffer message, boolean retained, Integer messageID) { ByteBuffer message, int messageID) {
String clientId = clientsession.clientID; String clientId = clientsession.clientID;
LOG.debug("directSend invoked clientId <{}> on topic <{}> QoS {} retained {} messageID {}", LOG.debug("directSend invoked clientId <{}> on topic <{}> QoS {} retained {} messageID {}",
clientId, topic, qos, retained, messageID); clientId, topic, qos, false, messageID);
PublishMessage pubMessage = new PublishMessage(); PublishMessage pubMessage = new PublishMessage();
pubMessage.setRetainFlag(retained); pubMessage.setRetainFlag(false);
pubMessage.setTopicName(topic); pubMessage.setTopicName(topic);
pubMessage.setQos(qos); pubMessage.setQos(qos);
pubMessage.setPayload(message); pubMessage.setPayload(message);
@@ -38,11 +38,6 @@ class PersistentQueueMessageSender {
//set the PacketIdentifier only for QoS > 0 //set the PacketIdentifier only for QoS > 0
if (pubMessage.getQos() != AbstractMessage.QOSType.MOST_ONE) { if (pubMessage.getQos() != AbstractMessage.QOSType.MOST_ONE) {
pubMessage.setMessageID(messageID); pubMessage.setMessageID(messageID);
} else {
if (messageID != null) {
throw new RuntimeException("Internal bad error, trying to forwardPublish a QoS 0 message " +
"with PacketIdentifier: " + messageID);
}
} }
if (connectionDescriptors == null) { if (connectionDescriptors == null) {