diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-09-11 12:27:14 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-09-11 12:27:14 +0000 |
| commit | 613071992900172cb00b5eff9f39b1cc06a5e2a8 (patch) | |
| tree | a8588ac44688e6d1a8f8cb2f2a41aebef8c685b0 /java/broker | |
| parent | 92da846b4b1bbba5fe914ad89e161f5fb7c21a31 (diff) | |
| download | qpid-python-613071992900172cb00b5eff9f39b1cc06a5e2a8.tar.gz | |
QPID-2093: Updated AMQBRokerManagerMBean to check if the queue is durable before performing store.deleteQueue().
Created ModelTest to validate the change, (testDeletionDurableViaJMX).
To facility the testing, extracted JMX Operations from ManagementActorLoggingTest to a new JMXTestUtils and updated both ModelTest and MALT to use this interface.
Updated 010(cpp) and 08(Java-InVM) excludes as the CPP does not have JMX and the InVM JMX is unreliable (see QPID-2097)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813801 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java index 2afd3c1dc3..5cfa8066e5 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java +++ b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java @@ -317,8 +317,10 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr try { queue.delete(); - _messageStore.removeQueue(queue); - + if (queue.isDurable()) + { + _messageStore.removeQueue(queue); + } } catch (AMQException ex) { |