root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DefaultMessageListenerContainer stops if recovery failed after interrupt signal 

Issue: SPR-11787
This commit is contained in:
Juergen Hoeller 2016-02-16 22:28:10 +01:00
parent 51c35bf81c
commit 1253b451f5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
View File

@ -197,6 +197,8 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
private volatile boolean recovering = false; private volatile boolean recovering = false;
private volatile boolean interrupted = false;
private Runnable stopCallback; private Runnable stopCallback;
private Object currentRecoveryMarker = new Object(); private Object currentRecoveryMarker = new Object();
@ -893,6 +895,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
} }
finally { finally {
this.recovering = false; this.recovering = false;
this.interrupted = false;
} }
} }
@ -976,6 +979,10 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
* @since 4.1 * @since 4.1
*/ */
protected boolean applyBackOffTime(BackOffExecution execution) { protected boolean applyBackOffTime(BackOffExecution execution) {
if (this.recovering && this.interrupted) {
// Interrupted right before and still failing... give up.
return false;
}
long interval = execution.nextBackOff(); long interval = execution.nextBackOff();
if (interval == BackOffExecution.STOP) { if (interval == BackOffExecution.STOP) {
return false; return false;
@ -987,9 +994,12 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
catch (InterruptedException interEx) { catch (InterruptedException interEx) {
// Re-interrupt current thread, to allow other threads to react. // Re-interrupt current thread, to allow other threads to react.
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
if (this.recovering) {
this.interrupted = true;
}
} }
return true;
} }
return true;
} }
/** /**