You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2015/09/10 11:10:43 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5960 -
durable sub pendingQueueSize after force shutdown
Repository: activemq
Updated Branches:
refs/heads/master 734fb7dda -> 4ab55f13a
https://issues.apache.org/jira/browse/AMQ-5960 - durable sub pendingQueueSize after force shutdown
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4ab55f13
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4ab55f13
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4ab55f13
Branch: refs/heads/master
Commit: 4ab55f13ae4097de1dad14af36b65a89eda9b81d
Parents: 734fb7d
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Thu Sep 10 11:10:13 2015 +0200
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Thu Sep 10 11:10:37 2015 +0200
----------------------------------------------------------------------
.../org/apache/activemq/store/kahadb/MessageDatabase.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/4ab55f13/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index b3fcfaa..5240b75 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1347,6 +1347,13 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
// be wrong..
sd.locationIndex.put(tx, location, previous);
metadata.lastUpdate = location;
+ // remove ack positions
+ Iterator<Entry<String, SequenceSet>> it = sd.ackPositions.iterator(tx);
+ while (it.hasNext()) {
+ Entry<String, SequenceSet> entry = it.next();
+ entry.getValue().remove(id);
+ }
+
}
// record this id in any event, initial send or recovery
metadata.producerSequenceIdTracker.isDuplicate(command.getMessageId());