Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 7553e4860 -> a79cf3b2d


NO-JIRA Cherry-pick fix


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a79cf3b2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a79cf3b2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a79cf3b2

Branch: refs/heads/1.x
Commit: a79cf3b2da4cf43f374b11cb2a6b141c9aff8841
Parents: 7553e48
Author: Martyn Taylor <[email protected]>
Authored: Sat Feb 18 14:04:11 2017 +0000
Committer: Martyn Taylor <[email protected]>
Committed: Sat Feb 18 14:04:11 2017 +0000

----------------------------------------------------------------------
 .../activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a79cf3b2/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
----------------------------------------------------------------------
diff --git 
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
 
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
index 161ee1d..77b45ab 100644
--- 
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
+++ 
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
@@ -159,7 +159,7 @@ public class MQTTPublishManager {
             Transaction tx = session.getServerSession().newTransaction();
             try {
                if (internal) {
-                  session.getServer().getPostOffice().route(serverMessage, tx, 
true);
+                  session.getServer().getPostOffice().route(serverMessage, 
null, tx, true);
                } else {
                   session.getServerSession().send(tx, serverMessage, true, 
false);
                }

Reply via email to