From 384ba2a8f82d0b0ec37f40cfd6b6bc5031b5fa55 Mon Sep 17 00:00:00 2001
From: Atsushi Yoshikawa <yoshikawaa@pm.nttdata.co.jp>
Date: Tue, 25 Oct 2022 23:52:19 +0900
Subject: [PATCH] Fix producer Binding#companion bean not set

---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index b77d0afad..044b0d698 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -303,7 +303,8 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		};
 
 		Lifecycle companion = null;
-		String companionLifecycleName = destination + "_spca";
+		String outputChannelName = ((AbstractMessageChannel) outputChannel).getBeanName();
+		String companionLifecycleName = outputChannelName + "_spca";
 		if (this.getApplicationContext().containsBean(companionLifecycleName)) {
 			companion = this.getApplicationContext().getBean(companionLifecycleName, Lifecycle.class);
 		}