From dd52482a9bd7b44159832cff68bbf4efaeefbe77 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 13 Jun 2022 19:34:45 +0200
Subject: [PATCH] GH-2374 minor adjustments to functional error handling

---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 126e570d3..c2a9130e1 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -208,7 +208,6 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 	 * configuration of the listener container instance created by the binder.
 	 * @param containerCustomizer the {@link ListenerContainerCustomizer} to use.
 	 */
-	@SuppressWarnings("unchecked")
 	public void setContainerCustomizer(@Nullable ListenerContainerCustomizer<?> containerCustomizer) {
 
 		this.containerCustomizer =
@@ -737,6 +736,9 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 					"Error channel '" + errorChannelName
 							+ "' must be a SubscribableChannel");
 			errorChannel = (SubscribableChannel) errorChannelObject;
+			if (this.isSubscribable(errorChannel)) {
+				this.subscribeFunctionErrorHandler(errorChannelName, consumerProperties.getBindingName());
+			}
 		}
 		else {
 			BinderErrorChannel binderErrorChannel = new BinderErrorChannel();
@@ -745,7 +747,6 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 
 			((GenericApplicationContext) getApplicationContext()).registerBean(
 					errorChannelName, SubscribableChannel.class, () -> errorChannel);
-
 			this.subscribeFunctionErrorHandler(errorChannelName, consumerProperties.getBindingName());
 		}