From c5548464d4a138c0e055ebcf83b5cd2854bd64d8 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 20 Apr 2022 16:25:23 -0400 Subject: [PATCH] Fix Sonar Issue --- .../org/springframework/amqp/rabbit/core/RabbitTemplate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java index f8ba1a1b..fe244fe5 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java @@ -1944,6 +1944,7 @@ public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count @Nullable private Message doSendAndReceiveWithDirect(String exchange, String routingKey, Message message, @Nullable CorrelationData correlationData) { + ConnectionFactory connectionFactory = obtainTargetConnectionFactory( this.sendConnectionFactorySelectorExpression, message); if (this.usePublisherConnection && connectionFactory.getPublisherConnectionFactory() != null) { @@ -1957,7 +1958,7 @@ public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count boolean cancelConsumer = false; try { Channel channel = channelHolder.getChannel(); - if (isPublisherConfirmsOrReturns(connectionFactory)) { + if (isPublisherConfirmsOrReturns(connectionFactory)) { // NOSONAR false positive NP dereference addListener(channel); } Message reply = doSendAndReceiveAsListener(exchange, routingKey, message, correlationData, channel,