Revert the fix for AmqpChannelFactoryBean.destroy

artembilan · artembilan · commit c78108f80339 · 2018-06-11T19:45:33.000-04:00
https://build.spring.io/browse/INT-SI43X-278 The `AbstractAmqpChannel` is not `DisposableBean` in `4.3.x`
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
@@ -500,7 +500,9 @@ public void stop(Runnable callback) {
 
 	@Override
 	protected void destroyInstance(AbstractAmqpChannel instance) throws Exception {
-		this.channel.destroy();
+		if (instance instanceof DisposableBean) {
+			((DisposableBean) this.channel).destroy();
+		}
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,9 @@ public void stop(Runnable callback) {`
`500`	`500`
`501`	`501`	`@Override`
`502`	`502`	`protected void destroyInstance(AbstractAmqpChannel instance) throws Exception {`
`503`		`- this.channel.destroy();`
	`503`	`+ if (instance instanceof DisposableBean) {`
	`504`	`+ ((DisposableBean) this.channel).destroy();`
	`505`	`+ }`
`504`	`506`	`}`
`505`	`507`
`506`	`508`	`}`