activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-393 Server logs message with queue deploy even when topic is being deployed.
Date Mon, 08 Feb 2016 15:13:33 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 747bf9e57 -> 17f5c9a5c


ARTEMIS-393 Server logs message with queue deploy even when topic is being deployed.


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

Branch: refs/heads/master
Commit: 2953e46aec18b1c635d7f97e62c1df9d99673f89
Parents: 747bf9e
Author: Dmitrii Tikhomirov <dtikhomi@redhat.com>
Authored: Fri Feb 5 19:46:31 2016 +0100
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Feb 8 10:12:56 2016 -0500

----------------------------------------------------------------------
 .../artemis/core/server/ActiveMQServerLogger.java       |  4 ++++
 .../artemis/core/server/impl/ActiveMQServerImpl.java    | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2953e46a/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 c21bfc1..f7038fb 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
@@ -305,6 +305,10 @@ public interface ActiveMQServerLogger extends BasicLogger {
    @Message(id = 221051, value = "Populating security roles from LDAP at: {0}", format =
Message.Format.MESSAGE_FORMAT)
    void populatingSecurityRolesFromLDAP(String url);
 
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 221052, value = "trying to deploy topic {0}", format = Message.Format.MESSAGE_FORMAT)
+   void deployTopic(SimpleString topicName);
+
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222000, value = "ActiveMQServer is being finalized and has not been stopped.
Please remember to stop the server before letting it go out of scope",
       format = Message.Format.MESSAGE_FORMAT)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2953e46a/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 4963ed8..8c4b7bd 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
@@ -1276,13 +1276,19 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
    @Override
    public Queue deployQueue(final SimpleString address,
-                            final SimpleString queueName,
+                            final SimpleString resourceName,
                             final SimpleString filterString,
                             final boolean durable,
                             final boolean temporary) throws Exception {
-      ActiveMQServerLogger.LOGGER.deployQueue(queueName);
 
-      return createQueue(address, queueName, filterString, null, durable, temporary, true,
false, false);
+      if (resourceName.toString().toLowerCase().startsWith("jms.topic")) {
+         ActiveMQServerLogger.LOGGER.deployTopic(resourceName);
+      }
+      else {
+         ActiveMQServerLogger.LOGGER.deployQueue(resourceName);
+      }
+
+      return createQueue(address, resourceName, filterString, null, durable, temporary, true,
false, false);
    }
 
    @Override


Mime
View raw message