From 1334c751473f5cc0a22db83368e3fb8b26a6255e Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 20 Dec 2019 11:55:26 -0500
Subject: [PATCH] Fix new Sonar smell

---
 .../AbstractMethodAnnotationPostProcessor.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index a03b993ce2..db5157e10c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -175,23 +175,24 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 		}
 	}
 
-	private MessageHandler registerHandlerBean(String beanName, Method method, MessageHandler handler) {
+	private MessageHandler registerHandlerBean(String beanName, Method method, final MessageHandler handler) {
+		MessageHandler handlerBean = handler;
 		String handlerBeanName = generateHandlerBeanName(beanName, method);
-		if (handler instanceof ReplyProducingMessageHandlerWrapper
+		if (handlerBean instanceof ReplyProducingMessageHandlerWrapper
 				&& StringUtils.hasText(MessagingAnnotationUtils.endpointIdValue(method))) {
 			handlerBeanName = handlerBeanName + ".wrapper";
 		}
-		if (handler instanceof IntegrationObjectSupport) {
-			((IntegrationObjectSupport) handler).setComponentName(
+		if (handlerBean instanceof IntegrationObjectSupport) {
+			((IntegrationObjectSupport) handlerBean).setComponentName(
 					handlerBeanName.substring(0,
 							handlerBeanName.indexOf(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX)));
 		}
 		this.beanFactory.registerSingleton(handlerBeanName, handler);
-		handler = (MessageHandler) this.beanFactory.initializeBean(handler, handlerBeanName);
-		if (handler instanceof DisposableBean && this.disposables != null) {
-			this.disposables.add((DisposableBean) handler);
+		handlerBean = (MessageHandler) this.beanFactory.initializeBean(handlerBean, handlerBeanName);
+		if (handlerBean instanceof DisposableBean && this.disposables != null) {
+			this.disposables.add((DisposableBean) handlerBean);
 		}
-		return handler;
+		return handlerBean;
 	}