From 5e2adc0ed7dfe2e827bdef878f1c8cde12ff5773 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon (cshannon)" <christopher.l.shannon@gmail.com>
Date: Fri, 9 Mar 2018 07:39:45 -0500
Subject: [PATCH] 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
---
 .../broker/region/cursors/StoreDurableSubscriberCursor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 269bde375c..78645564d9 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()) {