From commits-return-50118-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Wed Jan 10 17:43:14 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id DE46418076D for ; Wed, 10 Jan 2018 17:43:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CEA89160C23; Wed, 10 Jan 2018 16:43:14 +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 1FE88160C2E for ; Wed, 10 Jan 2018 17:43:13 +0100 (CET) Received: (qmail 58160 invoked by uid 500); 10 Jan 2018 16:43: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 58143 invoked by uid 99); 10 Jan 2018 16:43:13 -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; Wed, 10 Jan 2018 16:43:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2DCEDDFDE6; Wed, 10 Jan 2018 16:43:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Wed, 10 Jan 2018 16:43:14 -0000 Message-Id: <883d56d2b6b84216987de5d1e28f4c2b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: ARTEMIS-1594 don't log dlq/expiry warn for internal q ARTEMIS-1594 don't log dlq/expiry warn for internal q Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7c3e78ca Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7c3e78ca Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7c3e78ca Branch: refs/heads/master Commit: 7c3e78ca877d1349d06016c38cf7bfe7014415e2 Parents: 9e68d84 Author: Justin Bertram Authored: Tue Jan 9 11:29:33 2018 -0600 Committer: Clebert Suconic Committed: Wed Jan 10 11:43:06 2018 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7c3e78ca/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index 41f504f..cb94aed 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -3258,7 +3258,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { } private void checkDeadLetterAddressAndExpiryAddress(final AddressSettings settings) { - if (!Env.isTestEnv()) { + if (!Env.isTestEnv() && !internalQueue && !address.equals(server.getConfiguration().getManagementNotificationAddress())) { if (settings.getDeadLetterAddress() == null) { ActiveMQServerLogger.LOGGER.AddressSettingsNoDLA(name); }