From c78108f8033922ca1e65c6489d9b40ada516d00f Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 11 Jun 2018 19:45:33 -0400
Subject: [PATCH] Revert the fix for AmqpChannelFactoryBean.destroy

https://build.spring.io/browse/INT-SI43X-278

The `AbstractAmqpChannel` is not `DisposableBean` in `4.3.x`
---
 .../integration/amqp/config/AmqpChannelFactoryBean.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java
index 9ac0d35ccb..393383d5c3 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java
@@ -500,7 +500,9 @@ public class AmqpChannelFactoryBean extends AbstractFactoryBean<AbstractAmqpChan
 
 	@Override
 	protected void destroyInstance(AbstractAmqpChannel instance) throws Exception {
-		this.channel.destroy();
+		if (instance instanceof DisposableBean) {
+			((DisposableBean) this.channel).destroy();
+		}
 	}
 
 }