From 96fa8458ce9d2dc23a1cfc429611b3c334ea5194 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Wed, 20 May 2020 15:15:48 +0100
Subject: [PATCH] [AMQ-7394] use canRecoveryNextMessage to base blocking on
 shared usage, the existing fix regressed AMQ5266Test

---
 .../java/org/apache/activemq/store/jdbc/JDBCMessageStore.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
index f7ca921a74..8adc2f78ee 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
@@ -367,7 +367,7 @@ public class JDBCMessageStore extends AbstractMessageStore {
 
                 @Override
                 public boolean recoverMessage(long sequenceId, byte[] data) throws Exception {
-                    if (listener.hasSpace()) {
+                    if (listener.canRecoveryNextMessage()) {
                         Message msg = (Message) wireFormat.unmarshal(new ByteSequence(data));
                         msg.getMessageId().setBrokerSequenceId(sequenceId);
                         msg.getMessageId().setFutureOrSequenceLong(sequenceId);