From fcd981027a49090b7ccfacdac5f56f6d3422e0e7 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Mon, 1 Feb 2016 11:00:23 +0000 Subject: [PATCH] Fix Delete TX on JDBCJournalImpl The JDBC in memory Tx representation was using the Tx ID instead of the Record ID which was causing deletes to fail. Also the Store line up should be set to true as default. --- .../activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java | 2 +- .../activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java index ad0f8698a7..82053d437c 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java @@ -301,7 +301,7 @@ public class JDBCJournalImpl implements Journal { // We actually only need the record ID in this instance. if (record.isTransactional()) { - RecordInfo info = new RecordInfo(record.getTxId(), record.getRecordType(), new byte[0], record.isUpdate(), record.getCompactCount()); + RecordInfo info = new RecordInfo(record.getId(), record.getRecordType(), new byte[0], record.isUpdate(), record.getCompactCount()); if (record.getRecordType() == JDBCJournalRecord.DELETE_RECORD_TX) { txHolder.recordsToDelete.add(info); } diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java index f5e76a3fc5..bf52a17abf 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java @@ -63,7 +63,7 @@ public class JDBCJournalRecord { // Callback and sync operations private IOCompletion ioCompletion = null; - private boolean storeLineUp = false; + private boolean storeLineUp = true; private boolean sync = false; // DB Fields for all records