Author: tabish
Date: Tue Sep 11 03:27:20 2012
New Revision: 1383234
URL: http://svn.apache.org/viewvc?rev=1383234&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-4035 check for null.
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java?rev=1383234&r1=1383233&r2=1383234&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
Tue Sep 11 03:27:20 2012
@@ -710,7 +710,7 @@ public class KahaDBStore extends Message
command.setDestination(dest);
command.setSubscriptionKey(subscriptionKey);
command.setMessageId(messageId.toString());
-
command.setTransactionInfo(transactionIdTransformer.transform(ack.getTransactionId()));
+ command.setTransactionInfo(ack != null ?
transactionIdTransformer.transform(ack.getTransactionId()) : null);
if (ack != null && ack.isUnmatchedAck()) {
command.setAck(UNMATCHED);
} else {
