Author: clebert.suconic(a)jboss.com Date: 2009-12-06 03:17:19 -0500 (Sun, 06 Dec 2009) New Revision: 8587 Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java Log: tweak on my last fix to fix BasicXATest Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-12-06 06:58:34 UTC (rev 8586) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-12-06 08:17:19 UTC (rev 8587) @@ -949,14 +949,6 @@ final long transactionIdDuringPaging = pagedMessage.getTransactionID(); - postOffice.route(message, depageTransaction); - - // This means the page is duplicated. So we need to ignore this - if (depageTransaction.getState() == State.ROLLBACK_ONLY) - { - break; - } - PageTransactionInfo pageUserTransaction = null; if (transactionIdDuringPaging >= 0) @@ -1003,6 +995,15 @@ } + postOffice.route(message, depageTransaction); + + // This means the page is duplicated. So we need to ignore this + if (depageTransaction.getState() == State.ROLLBACK_ONLY) + { + break; + } + + // Update information about transactions // This needs to be done after routing because of duplication detection if (pageUserTransaction != null && message.isDurable())