Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanup: https://issues.apache.org/jira/browse/AMQ-3775 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1306886 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-03-29 14:49:31 +00:00
parent 81e1de95f8
commit c6ec76e6f6
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
View File

@ -1914,8 +1914,7 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
// on a new message add, all existing subs are interested in this message
private void addAckLocationForNewMessage(Transaction tx, StoredDestination sd, Long messageSequence) throws IOException {
for(String subscriptionKey : sd.subscriptionCache) {
SequenceSet sequences = null;
sequences = sd.ackPositions.get(tx, subscriptionKey);
SequenceSet sequences = sd.ackPositions.get(tx, subscriptionKey);
if (sequences == null) {
sequences = new SequenceSet();
sequences.add(new Sequence(messageSequence, messageSequence + 1));
@ -1945,19 +1944,16 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
ArrayList<Long> unreferenced = new ArrayList<Long>();
for(Long sequenceId : sequences) {
long references = 0;
Long count = sd.messageReferences.get(sequenceId);
if (count != null) {
references = count.longValue() - 1;
} else {
continue;
}
Long references = sd.messageReferences.get(sequenceId);
if (references != null) {
references = references.longValue() - 1;
if (references > 0) {
sd.messageReferences.put(sequenceId, Long.valueOf(references));
} else {
sd.messageReferences.remove(sequenceId);
unreferenced.add(sequenceId);
if (references.longValue() > 0) {
sd.messageReferences.put(sequenceId, references);
} else {
sd.messageReferences.remove(sequenceId);
unreferenced.add(sequenceId);
}
}
}