You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/09/21 20:56:55 UTC

[1/2] activemq-artemis git commit: Rename misleading divertBindingNotExists to divertBindingAlreadyExists

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� <vi...@iki.fi>
Authored: Wed Sep 21 00:06:31 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
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;
       }

[2/2] activemq-artemis git commit: This closes #783

Posted by cl...@apache.org.
This closes #783


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

Branch: refs/heads/master
Commit: df0d5d71e7543e03733bdab4f2413cb8fc689461
Parents: 3d8fbc1 53b8462
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 21 16:56:40 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:56:40 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(-)
----------------------------------------------------------------------