From 165a6f186d64ef1d51a3c0f4954a6d5fe6700e4d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Sun, 19 Jul 2020 19:53:01 +0200
Subject: [PATCH] Expose setExceptionListener on
 AbstractJmsListenerContainerFactory

Closes gh-22102
---
 .../AbstractJmsListenerContainerFactory.java  | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index 46eb71333aa3..39007467a0b9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.jms.config;
 
 import javax.jms.ConnectionFactory;
+import javax.jms.ExceptionListener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -48,10 +49,13 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 	private DestinationResolver destinationResolver;
 
 	@Nullable
-	private ErrorHandler errorHandler;
+	private MessageConverter messageConverter;
 
 	@Nullable
-	private MessageConverter messageConverter;
+	private ExceptionListener exceptionListener;
+
+	@Nullable
+	private ErrorHandler errorHandler;
 
 	@Nullable
 	private Boolean sessionTransacted;
@@ -99,17 +103,25 @@ public void setDestinationResolver(DestinationResolver destinationResolver) {
 	}
 
 	/**
-	 * @see AbstractMessageListenerContainer#setErrorHandler(ErrorHandler)
+	 * @see AbstractMessageListenerContainer#setMessageConverter(MessageConverter)
 	 */
-	public void setErrorHandler(ErrorHandler errorHandler) {
-		this.errorHandler = errorHandler;
+	public void setMessageConverter(MessageConverter messageConverter) {
+		this.messageConverter = messageConverter;
 	}
 
 	/**
-	 * @see AbstractMessageListenerContainer#setMessageConverter(MessageConverter)
+	 * @since 5.2.8
+	 * @see AbstractMessageListenerContainer#setExceptionListener(ExceptionListener)
 	 */
-	public void setMessageConverter(MessageConverter messageConverter) {
-		this.messageConverter = messageConverter;
+	public void setExceptionListener(ExceptionListener exceptionListener) {
+		this.exceptionListener = exceptionListener;
+	}
+
+	/**
+	 * @see AbstractMessageListenerContainer#setErrorHandler(ErrorHandler)
+	 */
+	public void setErrorHandler(ErrorHandler errorHandler) {
+		this.errorHandler = errorHandler;
 	}
 
 	/**
@@ -182,6 +194,7 @@ public void setAutoStartup(boolean autoStartup) {
 		this.autoStartup = autoStartup;
 	}
 
+
 	@Override
 	public C createListenerContainer(JmsListenerEndpoint endpoint) {
 		C instance = createContainerInstance();
@@ -192,12 +205,15 @@ public C createListenerContainer(JmsListenerEndpoint endpoint) {
 		if (this.destinationResolver != null) {
 			instance.setDestinationResolver(this.destinationResolver);
 		}
-		if (this.errorHandler != null) {
-			instance.setErrorHandler(this.errorHandler);
-		}
 		if (this.messageConverter != null) {
 			instance.setMessageConverter(this.messageConverter);
 		}
+		if (this.exceptionListener != null) {
+			instance.setExceptionListener(this.exceptionListener);
+		}
+		if (this.errorHandler != null) {
+			instance.setErrorHandler(this.errorHandler);
+		}
 		if (this.sessionTransacted != null) {
 			instance.setSessionTransacted(this.sessionTransacted);
 		}