Author: kwall
Date: Thu Oct 23 11:54:12 2014
New Revision: 1633795
URL: http://svn.apache.org/r1633795
Log:
QPID-6181: [Java Broker] JMX mbean improperly deletes queues
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1633795&r1=1633794&r2=1633795&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
Thu Oct 23 11:54:12 2014
@@ -291,7 +291,7 @@ public class VirtualHostManagerMBean ext
{
throw new OperationsException("No such queue \""+ queueName +"\"");
}
- queue.deleteAndReturnCount();
+ queue.delete();
}
@Override
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java?rev=1633795&r1=1633794&r2=1633795&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
Thu Oct 23 11:54:12 2014
@@ -125,7 +125,7 @@ public class VirtualHostManagerMBeanTest
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
