From 5f400b3853aae9f5a581de99cc390a6bb330f47f Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Sat, 24 Jul 2010 06:44:15 +0000 Subject: [PATCH] prevent npe git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@978813 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/store/kahadb/MessageDatabase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java index d1c7443a61..fca4b76be3 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java @@ -1009,8 +1009,8 @@ public class MessageDatabase extends ServiceSupport implements BrokerServiceAwar 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