From 61a0c1dc9cae54aa4e7987cd26573ffdb076ac79 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 11 Dec 2019 17:09:19 +0100
Subject: [PATCH] GH-1870 Fixed destroy beans logic

- Fixed destroy bean logic in AbstractMessageChannelBinder to ensure that it only destroys beans that are 'reachable' (have bean definitions)

Resolves #1870
---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 39eac4c80..f1e1197a7 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -824,7 +824,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 	}
 
 	private void destroyBean(String beanName) {
-		if (getApplicationContext().containsBean(beanName)) {
+		if (getApplicationContext().containsBeanDefinition(beanName)) {
 			((DefaultSingletonBeanRegistry) getApplicationContext().getBeanFactory())
 					.destroySingleton(beanName);
 			((GenericApplicationContext) getApplicationContext())