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

Moved params out of publishQos0

Browse Source
This commit is contained in:
andsel
2016-12-13 23:43:02 +01:00
parent da94a6a014
commit 3100d835df
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
+3 -3
View File
@@ -20,11 +20,11 @@ class BestEffortMessageSender {
this.connectionDescriptors = connectionDescriptors;
}
void publishQos0(ClientSession clientsession, String topic, ByteBuffer message, PublishMessage pubMessage) {
void publishQos0(ClientSession clientsession, PublishMessage pubMessage) {
String clientId = clientsession.clientID;
LOG.info("send publish message to <{}> on topic <{}>", clientId, topic);
LOG.info("send publish message to <{}> on topic <{}>", clientId, pubMessage.getTopicName());
if (LOG.isDebugEnabled()) {
LOG.debug("content <{}>", DebugUtils.payload2Str(message));
LOG.debug("content <{}>", DebugUtils.payload2Str(pubMessage.getPayload()));
}
if (connectionDescriptors == null) {
broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+1 -1
View File
@@ -62,7 +62,7 @@ class MessagesPublisher {
//QoS 0
if (qos == AbstractMessage.QOSType.MOST_ONE) {
PublishMessage publishMsg = BestEffortMessageSender.createPublishForQos(topic, MOST_ONE, message);
this.bestEffortSender.publishQos0(targetSession, topic, message, publishMsg);
this.bestEffortSender.publishQos0(targetSession, publishMsg);
} else {
//QoS 1 or 2
int messageId = targetSession.nextPacketId();
broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
-2
View File
@@ -1,6 +1,5 @@
package io.moquette.spi.impl;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.server.ConnectionDescriptor;
import io.moquette.spi.ClientSession;
@@ -8,7 +7,6 @@ import io.netty.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentMap;
class PersistentQueueMessageSender {