Repository: activemq Updated Branches: refs/heads/activemq-5.15.x 840c0c46d -> 77784061c
AMQ-5875 - fix test regression in MultiKahaDBQueueDeletionTest (cherry picked from commit 4c972d97b95ea521493db5def6869eab663e5f64) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/77784061 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/77784061 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/77784061 Branch: refs/heads/activemq-5.15.x Commit: 77784061c590dafd81a458ca20ec8efd1484a10f Parents: 840c0c4 Author: gtully <[email protected]> Authored: Thu May 31 10:20:53 2018 +0100 Committer: gtully <[email protected]> Committed: Wed Sep 19 10:25:55 2018 +0100 ---------------------------------------------------------------------- .../activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/77784061/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java index 4a30d0a..4bdb8de 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java @@ -306,7 +306,7 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem if (adapter instanceof PersistenceAdapter && adapter.getDestinations().isEmpty()) { adapter.removeQueueMessageStore(destination); removeMessageStore(adapter, destination); - destinationMap.removeAll(destination); + destinationMap.remove(destination, adapter); } } @@ -321,7 +321,7 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem if (adapter instanceof PersistenceAdapter && adapter.getDestinations().isEmpty()) { adapter.removeTopicMessageStore(destination); removeMessageStore(adapter, destination); - destinationMap.removeAll(destination); + destinationMap.remove(destination, adapter); } }
