From 284d37fa2b427e937e3ad9caedf86dd15560cf35 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 11 Sep 2019 14:33:29 +0200
Subject: [PATCH] GH-1799 Defer channel initialization until it is configured

Resolves #1799
---
 .../cloud/stream/binding/BinderAwareChannelResolver.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
index 95ec2a88a..879863440 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
@@ -102,9 +102,6 @@ public class BinderAwareChannelResolver
 			}
 			else {
 				channel = this.bindingTargetFactory.createOutput(channelName);
-				this.beanFactory.registerSingleton(channelName, channel);
-				channel = (MessageChannel) this.beanFactory.initializeBean(channel,
-						channelName);
 				if (this.newBindingCallback != null) {
 					ProducerProperties producerProperties = bindingServiceProperties
 							.getProducerProperties(channelName);
@@ -115,6 +112,9 @@ public class BinderAwareChannelResolver
 					bindingServiceProperties.updateProducerProperties(channelName,
 							producerProperties);
 				}
+				this.beanFactory.registerSingleton(channelName, channel);
+				channel = (MessageChannel) this.beanFactory.initializeBean(channel,
+						channelName);
 				Binding<MessageChannel> binding = this.bindingService
 						.bindProducer(channel, channelName);
 				this.dynamicDestinationsBindable.addOutputBinding(channelName, binding);