activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-5266 - fix regression in levedlb xa recovery and durable sub scan - org.apache.activemq.broker.mLevelDBXARecoveryBrokerTest and org.apache.activemq.bugs.AMQ2149LevelDBTest
Date Fri, 24 Oct 2014 13:31:59 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 1948fe41a -> 350889c1e


https://issues.apache.org/jira/browse/AMQ-5266 - fix regression in levedlb xa recovery and
durable sub scan - org.apache.activemq.broker.mLevelDBXARecoveryBrokerTest and org.apache.activemq.bugs.AMQ2149LevelDBTest


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/350889c1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/350889c1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/350889c1

Branch: refs/heads/trunk
Commit: 350889c1eb3bdb55335721649dda02780f251674
Parents: 1948fe4
Author: gtully <gary.tully@gmail.com>
Authored: Fri Oct 24 14:23:06 2014 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Oct 24 14:28:00 2014 +0100

----------------------------------------------------------------------
 .../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/350889c1/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index 52a785a..f86e05b 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -686,7 +686,8 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware
with P
       val sequence = lastSeq.synchronized {
         val seq = lastSeq.incrementAndGet()
         message.getMessageId.setFutureOrSequenceLong(seq);
-        if (indexListener != null) {
+        // null context on xa recovery, we want to bypass the cursor & pending adds as
it will be reset
+        if (indexListener != null && context != null) {
           pendingCursorAdds.synchronized { pendingCursorAdds.add(seq) }
           indexListener.onAdd(new MessageContext(context, message, new Runnable {
             def run(): Unit = pendingCursorAdds.synchronized { pendingCursorAdds.remove(seq)
}
@@ -920,7 +921,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware
with P
     def recoverNextMessages(clientId: String, subscriptionName: String, maxReturned: Int,
listener: MessageRecoveryListener): Unit = {
       check_running
       lookup(clientId, subscriptionName).foreach { sub =>
-        sub.cursorPosition = db.cursorMessages(preparedAcks, key, listener, sub.cursorPosition.max(sub.lastAckPosition+1),
maxReturned)
+        sub.cursorPosition = db.cursorMessages(preparedAcks, key, listener, sub.cursorPosition.max(sub.lastAckPosition+1),
Long.MaxValue, maxReturned)
       }
     }
 


Mime
View raw message