Repository: activemq-artemis Updated Branches: refs/heads/master 14723365a -> 3820ab8bb
ARTEMIS-1284 Deleting a queue is not cleaning up page This is fixing JMSPagingFileDeleteTest.testTopicsWithNonDurableSubscription Issue introduced at 84e8a87325a976c9970b8e85d03fc33207623af3 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3820ab8b Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3820ab8b Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3820ab8b Branch: refs/heads/master Commit: 3820ab8bb546f64502a477ac80a5eaa14ab480bb Parents: 1472336 Author: Clebert Suconic <[email protected]> Authored: Wed Jul 12 20:50:00 2017 -0400 Committer: Clebert Suconic <[email protected]> Committed: Wed Jul 12 20:52:22 2017 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3820ab8b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index d7f6364..f922c3a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -1462,12 +1462,12 @@ public class QueueImpl implements Queue { Transaction tx = new BindingsTransactionImpl(storageManager); try { - postOffice.removeBinding(name, tx, true); - deleteAllReferences(); destroyPaging(); + postOffice.removeBinding(name, tx, true); + if (removeConsumers) { for (ConsumerHolder consumerHolder : consumerList) { consumerHolder.consumer.disconnect();
