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

https://issues.apache.org/jira/browse/AMQ-6063 

Fixing potential NullPointerException during KahaDB index recovery.
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-11-25 16:02:52 +00:00
parent 35b7ac250b
commit 8f30866fdf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -762,12 +762,14 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
for (Long sequenceId : matches) { for (Long sequenceId : matches) {
MessageKeys keys = sd.orderIndex.remove(tx, sequenceId); MessageKeys keys = sd.orderIndex.remove(tx, sequenceId);
sd.locationIndex.remove(tx, keys.location); if (keys != null) {
sd.messageIdIndex.remove(tx, keys.messageId); sd.locationIndex.remove(tx, keys.location);
metadata.producerSequenceIdTracker.rollback(keys.messageId); sd.messageIdIndex.remove(tx, keys.messageId);
undoCounter++; metadata.producerSequenceIdTracker.rollback(keys.messageId);
decrementAndSubSizeToStoreStat(key, keys.location.getSize()); undoCounter++;
// TODO: do we need to modify the ack positions for the pub sub case? decrementAndSubSizeToStoreStat(key, keys.location.getSize());
// TODO: do we need to modify the ack positions for the pub sub case?
}
} }
} }