Skip to content

Commit

Permalink
tweak on my last fix to fix BasicXATest
Browse files Browse the repository at this point in the history
  • Loading branch information
clebertsuconic committed Dec 6, 2009
1 parent 7391970 commit fd2e308
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
Expand Up @@ -949,14 +949,6 @@ private boolean onDepage(final int pageId, final SimpleString destination, final


final long transactionIdDuringPaging = pagedMessage.getTransactionID(); 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; PageTransactionInfo pageUserTransaction = null;


if (transactionIdDuringPaging >= 0) if (transactionIdDuringPaging >= 0)
Expand Down Expand Up @@ -1003,6 +995,15 @@ private boolean onDepage(final int pageId, final SimpleString destination, final


} }


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 // Update information about transactions
// This needs to be done after routing because of duplication detection // This needs to be done after routing because of duplication detection
if (pageUserTransaction != null && message.isDurable()) if (pageUserTransaction != null && message.isDurable())
Expand Down

0 comments on commit fd2e308

Please sign in to comment.