Skip to content

Commit 7cbea74

Browse files
committed
Fix new Sonar smell
1 parent a5f8596 commit 7cbea74

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -350,36 +350,37 @@ private boolean sendInternal(Message<?> message, long timeout) {
350350
Deque<ChannelInterceptor> interceptorStack = null;
351351
boolean sent = false;
352352
ChannelInterceptorList interceptorList = this.interceptors;
353+
Message<?> messageToSend = message;
353354
try {
354-
message = convertPayloadIfNecessary(message);
355+
messageToSend = convertPayloadIfNecessary(messageToSend);
355356
boolean debugEnabled = this.loggingEnabled && this.logger.isDebugEnabled();
356357
if (debugEnabled) {
357-
logger.debug("preSend on channel '" + this + "', message: " + message);
358+
logger.debug("preSend on channel '" + this + "', message: " + messageToSend);
358359
}
359360
if (interceptorList.getSize() > 0) {
360361
interceptorStack = new ArrayDeque<>();
361-
message = interceptorList.preSend(message, this, interceptorStack);
362-
if (message == null) {
362+
messageToSend = interceptorList.preSend(messageToSend, this, interceptorStack);
363+
if (messageToSend == null) {
363364
return false;
364365
}
365366
}
366367

367-
sent = doSend(message, timeout);
368+
sent = doSend(messageToSend, timeout);
368369

369370
if (debugEnabled) {
370-
logger.debug("postSend (sent=" + sent + ") on channel '" + this + "', message: " + message);
371+
logger.debug("postSend (sent=" + sent + ") on channel '" + this + "', message: " + messageToSend);
371372
}
372373
if (interceptorStack != null) {
373-
interceptorList.postSend(message, this, sent);
374-
interceptorList.afterSendCompletion(message, this, sent, null, interceptorStack);
374+
interceptorList.postSend(messageToSend, this, sent);
375+
interceptorList.afterSendCompletion(messageToSend, this, sent, null, interceptorStack);
375376
}
376377
return sent;
377378
}
378379
catch (Exception ex) {
379380
if (interceptorStack != null) {
380-
interceptorList.afterSendCompletion(message, this, sent, ex, interceptorStack);
381+
interceptorList.afterSendCompletion(messageToSend, this, sent, ex, interceptorStack);
381382
}
382-
throw IntegrationUtils.wrapInDeliveryExceptionIfNecessary(message,
383+
throw IntegrationUtils.wrapInDeliveryExceptionIfNecessary(messageToSend,
383384
() -> "failed to send Message to channel '" + getComponentName() + "'", ex);
384385
}
385386
}

0 commit comments

Comments
 (0)