Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 8ad8feffa -> 13f1ca36f
ARTEMIS-2158 don't get pagedMessage if it's nontransactional (cherry picked from commit e024efcccde28ec6ad863cc4d1ad1df7e105905c) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/13f1ca36 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/13f1ca36 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/13f1ca36 Branch: refs/heads/2.6.x Commit: 13f1ca36faf7500b36c7b423b3fb174f1cf2c283 Parents: 8ad8fef Author: yang wei <wy96...@gmail.com> Authored: Wed Oct 31 10:02:11 2018 +0800 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Oct 31 15:55:05 2018 -0400 ---------------------------------------------------------------------- .../artemis/core/paging/cursor/PagedReferenceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/13f1ca36/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java index 081f7da..7bbabd1 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java @@ -67,7 +67,7 @@ public class PagedReferenceImpl extends LinkedListImpl.Node<PagedReferenceImpl> private static final byte UNDEFINED_IS_LARGE_MESSAGE = 2; private byte largeMessage; - private long transactionID = -1; + private long transactionID = -2; private long messageID = -1; @@ -124,7 +124,7 @@ public class PagedReferenceImpl extends LinkedListImpl.Node<PagedReferenceImpl> getPersistentSize(); } else { this.largeMessage = UNDEFINED_IS_LARGE_MESSAGE; - this.transactionID = -1; + this.transactionID = -2; this.messageID = -1; this.messageSize = -1; } @@ -317,7 +317,7 @@ public class PagedReferenceImpl extends LinkedListImpl.Node<PagedReferenceImpl> @Override public long getTransactionID() { - if (transactionID < 0) { + if (transactionID < -1) { transactionID = getPagedMessage().getTransactionID(); } return transactionID;