Fix Sonar Issue

spring-projects · Apr 20, 2022 · 59197ca · 59197ca
1 parent 3b4a7e4
commit 59197ca
Showing 1 changed file with 2 additions and 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
@@ -1944,6 +1944,7 @@ protected Message doSendAndReceiveWithFixed(final String exchange, final String
 	@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 @@ private Message doSendAndReceiveWithDirect(String exchange, String routingKey, M
 		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,