Repository: activemq Updated Branches: refs/heads/master 83514ef79 -> 3ea18f4ed
fix npe in long time failing ci JournalDurableSubscriptionTest Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3ea18f4e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3ea18f4e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3ea18f4e Branch: refs/heads/master Commit: 3ea18f4ed1caa078e5c55b09a93fcd686b633d75 Parents: 83514ef Author: gtully <gary.tu...@gmail.com> Authored: Wed Jul 4 10:40:31 2018 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Wed Jul 4 10:40:31 2018 +0100 ---------------------------------------------------------------------- .../apache/activemq/store/journal/JournalTopicMessageStore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/3ea18f4e/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java ---------------------------------------------------------------------- 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 c083482..7aa61a2 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); } }
