From 680bd98f4b9f5c0fa0539f052df875cb85545ca2 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Thu, 25 Apr 2019 13:46:32 +0200
Subject: [PATCH] Fixed destination resolve conflict in
 StreamListenerAnnotationBeanPostProcessor

---
 .../binding/StreamListenerAnnotationBeanPostProcessor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
index 66e819443..02fb0d2a9 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
@@ -318,7 +318,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 		Collection<StreamListenerResultAdapter> streamListenerResultAdapters = this.applicationContext
 				.getBeansOfType(StreamListenerResultAdapter.class).values();
 		this.binderAwareChannelResolver = this.applicationContext
-				.getBean(DestinationResolver.class);
+				.getBean("binderAwareChannelResolver", DestinationResolver.class);
 		this.messageHandlerMethodFactory = this.applicationContext
 				.getBean(MessageHandlerMethodFactory.class);
 		this.springIntegrationProperties = this.applicationContext