You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2018/05/31 09:21:07 UTC
activemq git commit: AMQ-5875 - fix test regression in
MultiKahaDBQueueDeletionTest
Repository: activemq
Updated Branches:
refs/heads/master cdb38b327 -> 4c972d97b
AMQ-5875 - fix test regression in MultiKahaDBQueueDeletionTest
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4c972d97
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4c972d97
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4c972d97
Branch: refs/heads/master
Commit: 4c972d97b95ea521493db5def6869eab663e5f64
Parents: cdb38b3
Author: gtully <ga...@gmail.com>
Authored: Thu May 31 10:20:53 2018 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu May 31 10:20:53 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/4c972d97/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);
}
}