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 2010/02/01 19:09:33 UTC
svn commit: r905349 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Author: gtully
Date: Mon Feb 1 18:09:32 2010
New Revision: 905349
URL: http://svn.apache.org/viewvc?rev=905349&view=rev
Log:
resolve: https://issues.apache.org/activemq/browse/AMQ-2589 - add null check
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=905349&r1=905348&r2=905349&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Mon Feb 1 18:09:32 2010
@@ -878,7 +878,9 @@
Long sequenceId = sd.messageIdIndex.remove(tx, command.getMessageId());
if (sequenceId != null) {
MessageKeys keys = sd.orderIndex.remove(tx, sequenceId);
- sd.locationIndex.remove(tx, keys.location);
+ if (keys != null) {
+ sd.locationIndex.remove(tx, keys.location);
+ }
}
} else {
// In the topic case we need remove the message once it's been acked