Revert the fix for AmqpChannelFactoryBean.destroy

https://build.spring.io/browse/INT-SI43X-278 The `AbstractAmqpChannel` is not `DisposableBean` in `4.3.x`
2018-06-11 19:45:33 -04:00
parent a74c9ef4fe
commit c78108f803
1 changed files with 3 additions and 1 deletions
--- 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();
+		}
 	}

 }