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

resolve: https://issues.apache.org/activemq/browse/AMQ-2589 - add null check 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@905349 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-02-01 18:09:32 +00:00
parent a3607423c4
commit 722258e196
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,8 +878,10 @@ public class MessageDatabase implements BrokerServiceAware {
Long sequenceId = sd.messageIdIndex.remove(tx, command.getMessageId()); Long sequenceId = sd.messageIdIndex.remove(tx, command.getMessageId());
if (sequenceId != null) { if (sequenceId != null) {
MessageKeys keys = sd.orderIndex.remove(tx, sequenceId); MessageKeys keys = sd.orderIndex.remove(tx, sequenceId);
if (keys != null) {
sd.locationIndex.remove(tx, keys.location); sd.locationIndex.remove(tx, keys.location);
} }
}
} else { } else {
// In the topic case we need remove the message once it's been acked // In the topic case we need remove the message once it's been acked
// by all the subs // by all the subs