From 3ea18f4ed1caa078e5c55b09a93fcd686b633d75 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Wed, 4 Jul 2018 10:40:31 +0100
Subject: [PATCH] fix npe in long time failing ci
 JournalDurableSubscriptionTest

---
 .../activemq/store/journal/JournalTopicMessageStore.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
index c083482307..7aa61a269c 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
@@ -188,8 +188,10 @@ public class JournalTopicMessageStore extends JournalMessageStore implements Top
                 while (iterator.hasNext()) {
                     SubscriptionKey subscriptionKey = iterator.next();
                     MessageId identity = cpAckedLastAckLocations.get(subscriptionKey);
+                    MessageAck ack = new MessageAck();
+                    ack.setMessageID(identity);
                     longTermStore.acknowledge(transactionTemplate.getContext(), subscriptionKey.clientId,
-                                              subscriptionKey.subscriptionName, identity, null);
+                                              subscriptionKey.subscriptionName, identity, ack);
                 }
 
             }