summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-jmx
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-04-17 12:38:47 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-04-17 12:38:47 +0000
commit672f3f7ab44bb4666deb95e80008a9d3e7b35806 (patch)
tree0889a31ee8cea09b84cb55e00d3ed02f2647b8d5 /qpid/java/broker-plugins/management-jmx
parent90a9dc3aae1bc0a755e032f472e1b37e6508b737 (diff)
downloadqpid-python-672f3f7ab44bb4666deb95e80008a9d3e7b35806.tar.gz
QPID-5580 : [Java Broker] Introduce explicit type hierarchy for queues in the ConfiguredObject model
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-jmx')
-rw-r--r--qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java2
-rw-r--r--qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
index 74183eafc5..e95ed9a383 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
@@ -185,7 +185,7 @@ public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueN
@Override
public String getQueueType()
{
- return (String) _queue.getAttribute(Queue.QUEUE_TYPE);
+ return (String) _queue.getAttribute(Queue.TYPE);
}
public boolean isDurable()
diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
index 2df196eff6..a81de49fb9 100644
--- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
@@ -131,7 +131,7 @@ public class QueueMBeanTest extends QpidTestCase
public void testQueueType() throws Exception
{
- when(_mockQueue.getAttribute(Queue.QUEUE_TYPE)).thenReturn(QUEUE_TYPE);
+ when(_mockQueue.getAttribute(Queue.TYPE)).thenReturn(QUEUE_TYPE);
MBeanTestUtils.assertMBeanAttribute(_queueMBean, "queueType", QUEUE_TYPE);
}