From 2bd8fa7c5dcfb2c29a5c5f61ff433bf161b1b86e Mon Sep 17 00:00:00 2001
From: Howard Gao <howard.gao@gmail.com>
Date: Thu, 13 Dec 2018 20:17:14 +0800
Subject: [PATCH] ARTEMIS-2197 Page deleted before transaction finishes

Fixed regression caused by previous commit
b36dc37c152cabe3a0d9af178db043f842bfcdc0
---
 .../artemis/core/server/impl/RefsOperation.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
index cc31a04650..3d8bdd6a96 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
@@ -132,16 +132,16 @@ public class RefsOperation extends TransactionOperationAbstract {
                message.incrementRefCount();
             }
             ackedTX.commit(true);
-
-            if (pagedMessagesToPostACK != null) {
-               for (MessageReference refmsg : pagedMessagesToPostACK) {
-                  ((PagedReference)refmsg).removePendingFlag();
-               }
-            }
          } catch (Exception e) {
             ActiveMQServerLogger.LOGGER.failedToProcessMessageReferenceAfterRollback(e);
          }
       }
+
+      if (pagedMessagesToPostACK != null) {
+         for (MessageReference refmsg : pagedMessagesToPostACK) {
+            ((PagedReference)refmsg).removePendingFlag();
+         }
+      }
    }
 
    protected void rollbackRedelivery(Transaction tx, MessageReference ref, long timeBase, Map<QueueImpl, LinkedList<MessageReference>> queueMap) throws Exception {