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 | 0ee4afcc8f02a1684f3864eacaaf6290507d1cd3 (patch) | |
| tree | c89da7540d6032838a9aff521b605504e4794e38 /qpid/java/broker/src/main | |
| parent | 6da9564f8e24c138c98f892b7b82d37e52bfc23c (diff) | |
| download | qpid-python-0ee4afcc8f02a1684f3864eacaaf6290507d1cd3.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@813801 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java index 2afd3c1dc3..5cfa8066e5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java +++ b/qpid/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) { |