Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3BE4F200C1F for ; Sat, 18 Feb 2017 14:39:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3AA8E160B71; Sat, 18 Feb 2017 13:39:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8BDCB160B63 for ; Sat, 18 Feb 2017 14:39:14 +0100 (CET) Received: (qmail 53154 invoked by uid 500); 18 Feb 2017 13:39:13 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 53135 invoked by uid 99); 18 Feb 2017 13:39:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Feb 2017 13:39:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3DE0DFC63; Sat, 18 Feb 2017 13:39:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Sat, 18 Feb 2017 13:39:11 -0000 Message-Id: <10d5ff1a4f364bc7a733468aabd1c712@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: NO-JIRA Send MQTT WILL outside of Server Session archived-at: Sat, 18 Feb 2017 13:39:15 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master 06688f5c3 -> 64b55778a NO-JIRA Send MQTT WILL outside of Server Session Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8b51ec27 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8b51ec27 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8b51ec27 Branch: refs/heads/master Commit: 8b51ec27db2e201c604e8178a574e344d73b033f Parents: 06688f5 Author: Martyn Taylor Authored: Sat Feb 18 13:31:57 2017 +0000 Committer: Martyn Taylor Committed: Sat Feb 18 13:31:57 2017 +0000 ---------------------------------------------------------------------- .../artemis/core/protocol/mqtt/MQTTPublishManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b51ec27/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 76f15c0..f0385dc 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 @@ -161,7 +161,12 @@ public class MQTTPublishManager { Transaction tx = session.getServerSession().newTransaction(); try { - session.getServerSession().send(tx, serverMessage, true, false); + if (internal) { + session.getServer().getPostOffice().route(serverMessage, tx, true); + } else { + session.getServerSession().send(tx, serverMessage, true, false); + } + if (retain) { boolean reset = payload instanceof EmptyByteBuf || payload.capacity() == 0; session.getRetainMessageManager().handleRetainedMessage(serverMessage, topic, reset, tx);