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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

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

clebertsuconic-2
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 9e68d8464 -> e5251ce60


This closes #1763


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

Branch: refs/heads/master
Commit: e5251ce60bc0db8a35491094429179f827533668
Parents: 9e68d84 7c3e78c
Author: Clebert Suconic <[hidden email]>
Authored: Wed Jan 10 11:43:06 2018 -0500
Committer: Clebert Suconic <[hidden email]>
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(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-1594 don't log dlq/expiry warn for internal q

clebertsuconic-2
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 <[hidden email]>
Authored: Tue Jan 9 11:29:33 2018 -0600
Committer: Clebert Suconic <[hidden email]>
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);
          }