You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2010/07/24 08:44:15 UTC
svn commit: r978813 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Author: rajdavies
Date: Sat Jul 24 06:44:15 2010
New Revision: 978813
URL: http://svn.apache.org/viewvc?rev=978813&view=rev
Log:
prevent npe
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=978813&r1=978812&r2=978813&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 Sat Jul 24 06:44:15 2010
@@ -1009,8 +1009,8 @@ public class MessageDatabase extends Ser
MessageKeys keys = sd.orderIndex.remove(tx, sequenceId);
if (keys != null) {
sd.locationIndex.remove(tx, keys.location);
- }
- recordAckMessageReferenceLocation(ackLocation, keys.location);
+ recordAckMessageReferenceLocation(ackLocation, keys.location);
+ }
}
} else {
// In the topic case we need remove the message once it's been acked