activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r905376 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Date Mon, 01 Feb 2010 19:13:13 GMT
Author: gtully
Date: Mon Feb  1 19:13:13 2010
New Revision: 905376

URL: http://svn.apache.org/viewvc?rev=905376&view=rev
Log:
merge -c 905349 https://svn.apache.org/repos/asf/activemq/trunk - resolve: https://issues.apache.org/activemq/browse/AMQ-2589
- add null check

Modified:
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=905376&r1=905375&r2=905376&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
(original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Mon Feb  1 19:13:13 2010
@@ -873,7 +873,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



Mime
View raw message