You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/03/09 12:41:23 UTC
activemq git commit: AMQ-6924 - Fix StoreDurableSubscriberCursor
non-persistent message add
Repository: activemq
Updated Branches:
refs/heads/master 0bb4a5c3a -> 5e2adc0ed
AMQ-6924 - Fix StoreDurableSubscriberCursor non-persistent message add
StoreDurableSubscriberCursor now properly uses a timeout value when
attempting to add to the temporary store for non-persistent messages to
prevent an indefinite wait on free space
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5e2adc0e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5e2adc0e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5e2adc0e
Branch: refs/heads/master
Commit: 5e2adc0ed7dfe2e827bdef878f1c8cde12ff5773
Parents: 0bb4a5c
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Fri Mar 9 07:39:45 2018 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Fri Mar 9 07:41:09 2018 -0500
----------------------------------------------------------------------
.../broker/region/cursors/StoreDurableSubscriberCursor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/5e2adc0e/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
index 269bde3..7864556 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
@@ -188,7 +188,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
Message msg = node.getMessage();
if (isStarted()) {
if (!msg.isPersistent()) {
- nonPersistent.addMessageLast(node);
+ nonPersistent.tryAddMessageLast(node, wait);
}
}
if (msg.isPersistent()) {