From 05d5ea9af805a2dddb3c2c732a7c3161030634d9 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     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 2c75ee9b1..b77d0afad 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
@@ -707,6 +707,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();
@@ -715,7 +718,6 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 
 			((GenericApplicationContext) getApplicationContext()).registerBean(
 					errorChannelName, SubscribableChannel.class, () -> errorChannel);
-
 			this.subscribeFunctionErrorHandler(errorChannelName, consumerProperties.getBindingName());
 		}