Back porting BZ-1019378

hornetq · Nov 6, 2013 · 7ab3587 · 7ab3587
1 parent 778b793
commit 7ab3587
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java b/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
@@ -908,6 +908,12 @@ else if (addressFullMessagePolicy == AddressFullMessagePolicy.BLOCK)
             currentPageSize.addAndGet(bytesToWrite);
          }
 
+         if (tx != null)
+         {
+            installPageTransaction(tx, listCtx);
+            tx.setWaitBeforeCommit(true);
+         }
+
          currentPage.write(pagedMessage);
 
          if (isTrace)
@@ -916,13 +922,6 @@ else if (addressFullMessagePolicy == AddressFullMessagePolicy.BLOCK)
                       " pageId=" + currentPage.getPageId());
          }
 
-
-         if (tx != null)
-         {
-            installPageTransaction(tx, listCtx);
-            tx.setWaitBeforeCommit(true);
-         }
-         else
          if (sync && tx == null)
          {
             sync();