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/27 21:49:39 UTC

[1/2] activemq-artemis git commit: ARTEMIS-755 Fix divert MBean warning

Repository: activemq-artemis
Updated Branches:
  refs/heads/master f5456e760 -> bd5786e8b


ARTEMIS-755 Fix divert MBean warning


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

Branch: refs/heads/master
Commit: e53998bf3ba8783d1b2ac6044c6e1863a8ec2dce
Parents: f5456e7
Author: jbertram <jb...@apache.com>
Authored: Tue Sep 27 10:38:43 2016 -0500
Committer: jbertram <jb...@apache.com>
Committed: Tue Sep 27 10:38:43 2016 -0500

----------------------------------------------------------------------
 .../core/server/management/impl/ManagementServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e53998bf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 26b6450..4fe6f9d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -539,8 +539,8 @@ public class ManagementServiceImpl implements ManagementService {
          if (!registeredNames.isEmpty()) {
             List<String> unexpectedResourceNames = new ArrayList<>();
             for (String name : resourceNames) {
-               // only addresses and queues should still be registered
-               if (!(name.startsWith(ResourceNames.CORE_ADDRESS) || name.startsWith(ResourceNames.CORE_QUEUE))) {
+               // only addresses, queues, and diverts should still be registered
+               if (!(name.startsWith(ResourceNames.CORE_ADDRESS) || name.startsWith(ResourceNames.CORE_QUEUE) || name.startsWith(ResourceNames.CORE_DIVERT))) {
                   unexpectedResourceNames.add(name);
                }
             }


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

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


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

Branch: refs/heads/master
Commit: bd5786e8bcfc24b88c799a3ebf8162e6c1b6c6dc
Parents: f5456e7 e53998b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Sep 27 17:49:26 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 27 17:49:26 2016 -0400

----------------------------------------------------------------------
 .../core/server/management/impl/ManagementServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------