ARTEMIS-2197 Page deleted before transaction finishes

Fixed regression caused by previous commit b36dc37 (cherry picked from 2bd8fa7)
apache · Dec 17, 2018 · 8a2f65c · 8a2f65c
1 parent b0a14ff
commit 8a2f65c
Showing 1 changed file with 6 additions and 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
@@ -132,16 +132,16 @@ public void afterRollback(final Transaction tx) {
                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 {