You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/12/09 03:15:38 UTC
[3/3] activemq-artemis git commit: Fix ManagementServiceImplTest
Fix ManagementServiceImplTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c84285f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c84285f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c84285f2
Branch: refs/heads/ARTEMIS-780
Commit: c84285f262fe2e7fbf51a96cae744ab662dc411e
Parents: 3f2a0af
Author: jbertram <jb...@apache.com>
Authored: Thu Dec 8 21:11:19 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Dec 8 21:11:19 2016 -0600
----------------------------------------------------------------------
.../core/server/management/impl/ManagementServiceImpl.java | 2 +-
.../artemis/tests/unit/core/postoffice/impl/FakeQueue.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c84285f2/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 71d988d..73dfda5 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
@@ -242,7 +242,7 @@ public class ManagementServiceImpl implements ManagementService {
queueControl.setMessageCounter(counter);
messageCounterManager.registerMessageCounter(queue.getName().toString(), counter);
}
- ObjectName objectName = objectNameBuilder.getQueueObjectName(address, queue.getName(),queue.getRoutingType());
+ ObjectName objectName = objectNameBuilder.getQueueObjectName(address, queue.getName(), queue.getRoutingType());
registerInJMX(objectName, queueControl);
registerInRegistry(ResourceNames.QUEUE + queue.getName(), queueControl);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c84285f2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index ed15c71..0a72178 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.filter.Filter;
import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
@@ -562,7 +563,7 @@ public class FakeQueue implements Queue {
@Override
public RoutingType getRoutingType() {
- return null;
+ return ActiveMQDefaultConfiguration.getDefaultRoutingType();
}
@Override