[activemq] branch master updated: [AMQ-7425] Simple fix to be sure to delete message from JDBC message store

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 4528b77  [AMQ-7425] Simple fix to be sure to delete message from JDBC message store
     new e20ef34  Merge pull request #495 from jbonofre/AMQ-7425
4528b77 is described below

commit 4528b773c6863b7f3994bcdc9772b1fb2a98cfd0
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Mar 3 07:36:42 2020 +0100

    [AMQ-7425] Simple fix to be sure to delete message from JDBC message store
---
 .../src/main/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 75c0751..92a1060 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];