You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/10/31 13:37:21 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2158 don't get
pagedMessage if it's nontransactional
Repository: activemq-artemis
Updated Branches:
refs/heads/master 123383b8d -> 2489020d5
ARTEMIS-2158 don't get pagedMessage if it's nontransactional
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e024efcc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e024efcc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e024efcc
Branch: refs/heads/master
Commit: e024efcccde28ec6ad863cc4d1ad1df7e105905c
Parents: 123383b
Author: yang wei <wy...@gmail.com>
Authored: Wed Oct 31 10:02:11 2018 +0800
Committer: yang wei <wy...@gmail.com>
Committed: Wed Oct 31 10:39:42 2018 +0800
----------------------------------------------------------------------
.../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/e024efcc/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 1534d05..5fd0a29 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
@@ -68,7 +68,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;
@@ -125,7 +125,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;
}
@@ -318,7 +318,7 @@ public class PagedReferenceImpl extends LinkedListImpl.Node<PagedReferenceImpl>
@Override
public long getTransactionID() {
- if (transactionID < 0) {
+ if (transactionID < -1) {
transactionID = getPagedMessage().getTransactionID();
}
return transactionID;
[2/2] activemq-artemis git commit: This closes #2405
Posted by cl...@apache.org.
This closes #2405
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2489020d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2489020d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2489020d
Branch: refs/heads/master
Commit: 2489020d59d041f5bdb3b1fe0da4d75746bc03c4
Parents: 123383b e024efc
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 31 09:37:15 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 31 09:37:15 2018 -0400
----------------------------------------------------------------------
.../artemis/core/paging/cursor/PagedReferenceImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------