From 19ea7f131aea5e97dbadb88e4ccf6dd5f6917798 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 16 Apr 2018 11:37:47 -0400
Subject: [PATCH] KBGH-356: Fix thread naming with no bean name

See https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/356

Use token 'consumer' for thread prefix when no bean name.

**cherry-pick to 2.0.x, 1.3.x**

(cherry picked from commit fd69447)
---
 .../kafka/listener/ConcurrentMessageListenerContainer.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
index e38d6a7c..ae2f94e6 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
@@ -154,9 +154,8 @@ public class ConcurrentMessageListenerContainer<K, V> extends AbstractMessageLis
 					container = new KafkaMessageListenerContainer<>(this, this.consumerFactory,
 							containerProperties, partitionSubset(containerProperties, i));
 				}
-				if (getBeanName() != null) {
-					container.setBeanName(getBeanName() + "-" + i);
-				}
+				String beanName = getBeanName();
+				container.setBeanName((beanName != null ? beanName : "consumer") + "-" + i);
 				if (getApplicationEventPublisher() != null) {
 					container.setApplicationEventPublisher(getApplicationEventPublisher());
 				}