DefaultMessageListenerContainer clears resources of paused tasks when shutting down after stop

jhoeller · jhoeller · commit 6b3284f6b00b · 2012-12-13T11:29:40.000+01:00
Issue: SPR-10092
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
@@ -214,6 +214,7 @@ public void shutdown() throws JmsException {
 			wasRunning = this.running;
 			this.running = false;
 			this.active = false;
+			this.pausedTasks.clear();
 			this.lifecycleMonitor.notifyAll();
 		}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -337,9 +337,10 @@ public final int getConcurrentConsumers() {
 	 * to scale the consumption of messages coming in from a queue. However,
 	 * note that any ordering guarantees are lost once multiple consumers are
 	 * registered. In general, stick with 1 consumer for low-volume queues.
-	 * <p><b>Do not raise the number of concurrent consumers for a topic.</b>
-	 * This would lead to concurrent consumption of the same message,
-	 * which is hardly ever desirable.
+	 * <p><b>Do not raise the number of concurrent consumers for a topic,
+	 * unless vendor-specific setup measures clearly allow for it.</b>
+	 * With regular setup, this would lead to concurrent consumption
+	 * of the same message, which is hardly ever desirable.
 	 * <p><b>This setting can be modified at runtime, for example through JMX.</b>
 	 * @see #setConcurrentConsumers
 	 */
@@ -526,13 +527,19 @@ protected void doShutdown() throws JMSException {
 		logger.debug("Waiting for shutdown of message listener invokers");
 		try {
 			synchronized (this.lifecycleMonitor) {
+				// Waiting for AsyncMessageListenerInvokers to deactivate themselves...
 				while (this.activeInvokerCount > 0) {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Still waiting for shutdown of " + this.activeInvokerCount +
 								" message listener invokers");
 					}
 					this.lifecycleMonitor.wait();
 				}
+				// Clear remaining scheduled invokers, possibly left over as paused tasks...
+				for (AsyncMessageListenerInvoker scheduledInvoker : this.scheduledInvokers) {
+					scheduledInvoker.clearResources();
+				}
+				this.scheduledInvokers.clear();
 			}
 		}
 		catch (InterruptedException ex) {

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ public void shutdown() throws JmsException {`
`214`	`214`	`wasRunning = this.running;`
`215`	`215`	`this.running = false;`
`216`	`216`	`this.active = false;`
	`217`	`+ this.pausedTasks.clear();`
`217`	`218`	`this.lifecycleMonitor.notifyAll();`
`218`	`219`	`}`
`219`	`220`