diff options
| author | Keith Wall <kwall@apache.org> | 2014-10-23 11:54:12 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-10-23 11:54:12 +0000 |
| commit | f879373292236ace97e72b3f6b8c80365b212c91 (patch) | |
| tree | 336c0606c490869f0ff9ec929aa74077860459e3 /qpid/java | |
| parent | 3838555c4f1817e84534ac092f657ae6d0957adf (diff) | |
| download | qpid-python-f879373292236ace97e72b3f6b8c80365b212c91.tar.gz | |
QPID-6181: [Java Broker] JMX mbean improperly deletes queues
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633795 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
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/VirtualHostManagerMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java index bb2769d447..e0c871c283 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java @@ -291,7 +291,7 @@ public class VirtualHostManagerMBean extends AbstractStatisticsGatheringMBean<Vi { throw new OperationsException("No such queue \""+ queueName +"\""); } - queue.deleteAndReturnCount(); + queue.delete(); } @Override diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java index bbb64e1879..dc3bf2d9f1 100644 --- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java +++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java @@ -125,7 +125,7 @@ public class VirtualHostManagerMBeanTest extends TestCase when(_mockVirtualHost.getChildByName(eq(Queue.class), eq(QUEUE_1_NAME))).thenReturn(mockQueue); _virtualHostManagerMBean.deleteQueue(QUEUE_1_NAME); - verify(mockQueue).deleteAndReturnCount(); + verify(mockQueue).delete(); } public void testDeleteQueueWhenQueueDoesNotExist() throws Exception |