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 E37E2200B4B for ; Thu, 21 Jul 2016 21:50:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E2109160A72; Thu, 21 Jul 2016 19:50:28 +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 1A09C160A7C for ; Thu, 21 Jul 2016 21:50:27 +0200 (CEST) Received: (qmail 16817 invoked by uid 500); 21 Jul 2016 19:50:27 -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 16678 invoked by uid 99); 21 Jul 2016 19:50:27 -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; Thu, 21 Jul 2016 19:50:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A143E3607; Thu, 21 Jul 2016 19:50:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Thu, 21 Jul 2016 19:50:30 -0000 Message-Id: In-Reply-To: <01b4d4d3f721478dbca041ff0e6ed92f@git.apache.org> References: <01b4d4d3f721478dbca041ff0e6ed92f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] activemq-artemis git commit: ARTEMIS-335 Remove dead code from MQTTPublishManager archived-at: Thu, 21 Jul 2016 19:50:29 -0000 ARTEMIS-335 Remove dead code from MQTTPublishManager Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fe0cb648 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fe0cb648 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fe0cb648 Branch: refs/heads/master Commit: fe0cb648d60ee6bab98f5f86225bbe18ca7c42de Parents: e8b189a Author: Martyn Taylor Authored: Wed Jul 20 13:24:09 2016 +0100 Committer: jbertram Committed: Thu Jul 21 14:47:20 2016 -0500 ---------------------------------------------------------------------- .../artemis/core/protocol/mqtt/MQTTPublishManager.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe0cb648/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 fc61dd9..c985c0f 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 @@ -90,16 +90,7 @@ public class MQTTPublishManager { } private int generateMqttId(int qos) { - if (qos == 1) { - return session.getSessionState().generateId(); - } - else { - Integer mqttid = session.getSessionState().generateId(); - if (mqttid == null) { - mqttid = (int) session.getServer().getStorageManager().generateID(); - } - return mqttid; - } + return session.getSessionState().generateId(); } /**