From 0bfdc88e2196ddfdf2c1fe7935b64fa3f7286cf7 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Tue, 13 Dec 2016 00:48:41 +0100
Subject: [PATCH] Removed unused argument

---
 .../main/java/io/moquette/spi/impl/MetaPublisher.java |  2 +-
 .../spi/impl/PersistentQueueMessageSender.java        | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java
index b1e27643..38d09d0e 100644
--- a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java
+++ b/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java
@@ -63,7 +63,7 @@ class MetaPublisher {
                     //QoS 1 or 2
                     int messageId = targetSession.nextPacketId();
                     targetSession.inFlightAckWaiting(guid, messageId);
-                    this.persistentSender.publishQos2(targetSession, topic, qos, message, false, messageId);
+                    this.persistentSender.publishQos2(targetSession, topic, qos, message, messageId);
                 }
             } else {
                 if (!targetSession.isCleanSession()) {
diff --git a/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
index 129f3d20..41348637 100644
--- a/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
+++ b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
@@ -21,12 +21,12 @@ class PersistentQueueMessageSender {
     }
 
     void publishQos2(ClientSession clientsession, String topic, AbstractMessage.QOSType qos,
-                             ByteBuffer message, boolean retained, Integer messageID) {
+                             ByteBuffer message, int messageID) {
         String clientId = clientsession.clientID;
         LOG.debug("directSend invoked clientId <{}> on topic <{}> QoS {} retained {} messageID {}",
-                clientId, topic, qos, retained, messageID);
+                clientId, topic, qos, false, messageID);
         PublishMessage pubMessage = new PublishMessage();
-        pubMessage.setRetainFlag(retained);
+        pubMessage.setRetainFlag(false);
         pubMessage.setTopicName(topic);
         pubMessage.setQos(qos);
         pubMessage.setPayload(message);
@@ -38,11 +38,6 @@ class PersistentQueueMessageSender {
         //set the PacketIdentifier only for QoS > 0
         if (pubMessage.getQos() != AbstractMessage.QOSType.MOST_ONE) {
             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) {