Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Dmitrii Tikhomirov 2016-02-05 19:46:31 +01:00 committed by Clebert Suconic
parent 747bf9e574
commit 2953e46aec
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -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) @Message(id = 221051, value = "Populating security roles from LDAP at: {0}", format = Message.Format.MESSAGE_FORMAT)
void populatingSecurityRolesFromLDAP(String url); 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) @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", @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) format = Message.Format.MESSAGE_FORMAT)

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1276,13 +1276,19 @@ public class ActiveMQServerImpl implements ActiveMQServer {
@Override @Override
public Queue deployQueue(final SimpleString address, public Queue deployQueue(final SimpleString address,
final SimpleString queueName, final SimpleString resourceName,
final SimpleString filterString, final SimpleString filterString,
final boolean durable, final boolean durable,
final boolean temporary) throws Exception { 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 @Override