admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2026-05-27 18:59:32 +02:00
parent 79f4f76bd2 1e45ad8fa6
commit a3f3ba5685
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
+15 -2
View File
@@ -1296,6 +1296,8 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
private @Nullable Object lastRecoveryMarker;
private @Nullable BackOffExecution invokerBackOff;
private int idleTaskExecutionCount = 0;
private volatile boolean idle = true;
@@ -1338,6 +1340,15 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
}
catch (Throwable ex) {
clearResources();
if (this.invokerBackOff != null) {
// We failed more than once in a row, probably due to a specific failure
// from the JMS receive call even after a successful connection recovery:
// locally wait before a further recovery attempt to avoid a burst retry.
applyBackOffTime(this.invokerBackOff);
}
else {
this.invokerBackOff = DefaultMessageListenerContainer.this.backOff.start();
}
boolean alreadyRecovered = false;
recoveryLock.lock();
try {
@@ -1449,7 +1460,9 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
this.currentReceiveThread = Thread.currentThread();
try {
initResourcesIfNecessary();
return receiveAndExecute(this, this.session, this.consumer);
boolean messageReceived = receiveAndExecute(this, this.session, this.consumer);
this.invokerBackOff = null; // successful receive attempt without exception
return messageReceived;
}
finally {
this.currentReceiveThread = null;
@@ -1471,7 +1484,6 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
}
}
@SuppressWarnings("NullAway") // Dataflow analysis limitation
private void initResourcesIfNecessary() throws JMSException {
if (getCacheLevel() <= CACHE_CONNECTION) {
updateRecoveryMarker();
@@ -1482,6 +1494,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
this.session = createSession(getSharedConnection());
}
if (this.consumer == null && getCacheLevel() >= CACHE_CONSUMER) {
Assert.state(this.session != null, "No cached Session");
this.consumer = createListenerConsumer(this.session);
lifecycleLock.lock();
try {