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 8ED48200B89 for ; Wed, 21 Sep 2016 22:56:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8D624160ADB; Wed, 21 Sep 2016 20:56:58 +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 D13EC160ABC for ; Wed, 21 Sep 2016 22:56:57 +0200 (CEST) Received: (qmail 74006 invoked by uid 500); 21 Sep 2016 20:56:55 -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 73913 invoked by uid 99); 21 Sep 2016 20:56:55 -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, 21 Sep 2016 20:56:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 976FFE0252; Wed, 21 Sep 2016 20:56:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Wed, 21 Sep 2016 20:56:55 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: Rename misleading divertBindingNotExists to divertBindingAlreadyExists archived-at: Wed, 21 Sep 2016 20:56:58 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master 3d8fbc139 -> df0d5d71e Rename misleading divertBindingNotExists to divertBindingAlreadyExists Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/53b84624 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/53b84624 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/53b84624 Branch: refs/heads/master Commit: 53b84624f3a8a0a50a3a9d1389efaaf541bf925e Parents: 3d8fbc1 Author: Ville Skyttä Authored: Wed Sep 21 00:06:31 2016 +0300 Committer: Clebert Suconic Committed: Wed Sep 21 16:56:39 2016 -0400 ---------------------------------------------------------------------- .../apache/activemq/artemis/core/server/ActiveMQServerLogger.java | 2 +- .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/53b84624/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index 4ae5442..a8dc14e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -360,7 +360,7 @@ public interface ActiveMQServerLogger extends BasicLogger { @LogMessage(level = Logger.Level.WARN) @Message(id = 222006, value = "Binding already exists with name {0}, divert will not be deployed", format = Message.Format.MESSAGE_FORMAT) - void divertBindingNotExists(SimpleString bindingName); + void divertBindingAlreadyExists(SimpleString bindingName); @LogMessage(level = Logger.Level.WARN) @Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ Artemis User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/53b84624/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 1f28754..7f67abc 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -1715,7 +1715,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { SimpleString sName = new SimpleString(config.getName()); if (postOffice.getBinding(sName) != null) { - ActiveMQServerLogger.LOGGER.divertBindingNotExists(sName); + ActiveMQServerLogger.LOGGER.divertBindingAlreadyExists(sName); return; }