From 4528b773c6863b7f3994bcdc9772b1fb2a98cfd0 Mon Sep 17 00:00:00 2001 From: jbonofre Date: Tue, 3 Mar 2020 07:36:42 +0100 Subject: [PATCH] [AMQ-7425] Simple fix to be sure to delete message from JDBC message store --- .../java/org/apache/activemq/store/jdbc/JDBCMessageStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java index 75c0751e08..92a1060cc5 100644 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java @@ -254,7 +254,7 @@ public class JDBCMessageStore extends AbstractMessageStore { @Override public void removeMessage(ConnectionContext context, MessageAck ack) throws IOException { - long seq = ack.getLastMessageId().getFutureOrSequenceLong() != null ? + long seq = (ack.getLastMessageId().getFutureOrSequenceLong() != null && ((Long) ack.getLastMessageId().getFutureOrSequenceLong() != 0)) ? (Long) ack.getLastMessageId().getFutureOrSequenceLong() : persistenceAdapter.getStoreSequenceIdForMessageId(context, ack.getLastMessageId(), destination)[0];