From e9a21680b3cf60c496df13d42fd2cde1b3cd958e Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 17 Jul 2021 08:49:07 -0400 Subject: [PATCH] Fix Sonar Issues --- .../amqp/rabbit/connection/ConnectionFactoryUtils.java | 8 ++++---- .../listener/adapter/MessagingMessageListenerAdapter.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java index 637c28e2..8316518f 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConnectionFactoryUtils.java @@ -43,7 +43,7 @@ import com.rabbitmq.client.Channel; */ public final class ConnectionFactoryUtils { - private static final ThreadLocal failures = new ThreadLocal<>(); + private static final ThreadLocal COMPLETION_EXCEPTIONS = new ThreadLocal<>(); private static boolean captureAfterCompletionExceptions; @@ -193,7 +193,7 @@ public final class ConnectionFactoryUtils { private static void completionFailed(AfterCompletionFailedException ex) { if (captureAfterCompletionExceptions) { - failures.set(ex); + COMPLETION_EXCEPTIONS.set(ex); } } @@ -215,9 +215,9 @@ public final class ConnectionFactoryUtils { * @since 2.3.10 */ public static void checkAfterCompletion() { - AfterCompletionFailedException ex = failures.get(); + AfterCompletionFailedException ex = COMPLETION_EXCEPTIONS.get(); if (ex != null) { - failures.remove(); + COMPLETION_EXCEPTIONS.remove(); throw ex; } } diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java index 09bee504..324bfc32 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java @@ -143,7 +143,7 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis catch (ListenerExecutionFailedException ex) { handleException(amqpMessage, channel, message, ex); } - catch (ReplyFailureException ex) { + catch (ReplyFailureException ex) { // NOSONAR throw ex; } catch (Exception ex) { // NOSONAR