This closes #687

artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java

@@ -81,7 +81,7 @@ public class JDBCJournalLoaderCallback implements LoaderCallback {
 
    @Override
    public synchronized void deleteRecord(final long id) {
-      for (Integer i : deleteReferences.get(id)) {
+      for (int i : deleteReferences.get(id)) {
          committedRecords.remove(i);
       }
    }

artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallbackTest.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.jdbc.store.journal;
+
+import java.util.ArrayList;
+
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class JDBCJournalLoaderCallbackTest {
+
+   @Test
+   public void testAddDeleteRecord() throws Exception {
+
+      ArrayList<RecordInfo> committedRecords = new ArrayList<>();
+      ArrayList<PreparedTransactionInfo> preparedTransactions = new ArrayList<>();
+      TransactionFailureCallback failureCallback = null;
+      boolean fixBadTX = false;
+
+      JDBCJournalLoaderCallback cb = new JDBCJournalLoaderCallback(committedRecords, preparedTransactions, failureCallback, fixBadTX);
+
+      RecordInfo record = new RecordInfo(42, (byte) 0, null, false, (short) 0);
+      cb.addRecord(record);
+      assertEquals(1, committedRecords.size());
+      assertTrue(committedRecords.contains(record));
+
+      cb.deleteRecord(record.id);
+      assertTrue(committedRecords.isEmpty());
+   }
+}

artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java

@@ -1195,7 +1195,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
             }
          }
          else {
-            txMap.remove(info);
+            txMap.remove(txID);
             clearOpeartionContext();
          }
 

artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java

@@ -271,7 +271,7 @@ public class AMQSession implements SessionCallback {
       * not receive acks will be resent.  (ActiveMQ broker handles this by returning a last sequence id received to
       * the client).  To handle this in Artemis we use a duplicate ID cache.  To do this we check to see if the
       * message comes from failover connection.  If so we add a DUPLICATE_ID to handle duplicates after a resend. */
-      if (connection.getContext().isFaultTolerant() && !messageSend.getProperties().containsKey(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID)) {
+      if (connection.getContext().isFaultTolerant() && !messageSend.getProperties().containsKey(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID.toString())) {
          originalCoreMsg.putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID.toString(), messageSend.getMessageId().toString());
       }
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java

@@ -185,7 +185,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends org.apache.activemq.
       con.close();
 
       PersistenceAdapter persistenceAdapter = broker.getPersistenceAdapter();
-      if (persistenceAdapter instanceof KahaDBStore) {
+      if (persistenceAdapter instanceof KahaDBPersistenceAdapter) {
          final KahaDBStore store = ((KahaDBPersistenceAdapter) persistenceAdapter).getStore();
          LOG.info("Store page count: " + store.getPageFile().getPageCount());
          LOG.info("Store free page count: " + store.getPageFile().getFreePageCount());