Skip to content

Commit 1334c75

Browse files
committed
Fix new Sonar smell
1 parent 5455ccb commit 1334c75

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,23 +175,24 @@ public Object postProcess(Object bean, String beanName, Method method, List<Anno
175175
}
176176
}
177177

178-
private MessageHandler registerHandlerBean(String beanName, Method method, MessageHandler handler) {
178+
private MessageHandler registerHandlerBean(String beanName, Method method, final MessageHandler handler) {
179+
MessageHandler handlerBean = handler;
179180
String handlerBeanName = generateHandlerBeanName(beanName, method);
180-
if (handler instanceof ReplyProducingMessageHandlerWrapper
181+
if (handlerBean instanceof ReplyProducingMessageHandlerWrapper
181182
&& StringUtils.hasText(MessagingAnnotationUtils.endpointIdValue(method))) {
182183
handlerBeanName = handlerBeanName + ".wrapper";
183184
}
184-
if (handler instanceof IntegrationObjectSupport) {
185-
((IntegrationObjectSupport) handler).setComponentName(
185+
if (handlerBean instanceof IntegrationObjectSupport) {
186+
((IntegrationObjectSupport) handlerBean).setComponentName(
186187
handlerBeanName.substring(0,
187188
handlerBeanName.indexOf(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX)));
188189
}
189190
this.beanFactory.registerSingleton(handlerBeanName, handler);
190-
handler = (MessageHandler) this.beanFactory.initializeBean(handler, handlerBeanName);
191-
if (handler instanceof DisposableBean && this.disposables != null) {
192-
this.disposables.add((DisposableBean) handler);
191+
handlerBean = (MessageHandler) this.beanFactory.initializeBean(handlerBean, handlerBeanName);
192+
if (handlerBean instanceof DisposableBean && this.disposables != null) {
193+
this.disposables.add((DisposableBean) handlerBean);
193194
}
194-
return handler;
195+
return handlerBean;
195196
}
196197

197198

0 commit comments

Comments
 (0)