Fix Sonar Issue

spring-projects · Dec 21, 2021 · 525172b · 525172b
1 parent 6189b10
commit 525172b
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/.../main/java/org/springframework/amqp/rabbit/config/BaseRabbitListenerContainerFactory.java b/.../main/java/org/springframework/amqp/rabbit/config/BaseRabbitListenerContainerFactory.java
@@ -110,18 +110,21 @@ protected void applyCommonOverrides(@Nullable RabbitListenerEndpoint endpoint, C
 			instance.setListenerId(endpoint.getId());
 			endpoint.setupListenerContainer(instance);
 		}
-		if (instance.getMessageListener() instanceof AbstractAdaptableMessageListener) {
-			AbstractAdaptableMessageListener messageListener = (AbstractAdaptableMessageListener) instance
-					.getMessageListener();
+		Object iml = instance.getMessageListener();
+		if (iml instanceof AbstractAdaptableMessageListener) {
+			AbstractAdaptableMessageListener messageListener = (AbstractAdaptableMessageListener) iml;
 			JavaUtils.INSTANCE // NOSONAR
 					.acceptIfNotNull(this.beforeSendReplyPostProcessors,
 							messageListener::setBeforeSendReplyPostProcessors)
 					.acceptIfNotNull(this.retryTemplate, messageListener::setRetryTemplate)
 					.acceptIfCondition(this.retryTemplate != null && this.recoveryCallback != null,
 							this.recoveryCallback, messageListener::setRecoveryCallback)
-					.acceptIfNotNull(this.defaultRequeueRejected, messageListener::setDefaultRequeueRejected)
-					.acceptIfNotNull(endpoint.getReplyPostProcessor(), messageListener::setReplyPostProcessor)
-					.acceptIfNotNull(endpoint.getReplyContentType(), messageListener::setReplyContentType);
+					.acceptIfNotNull(this.defaultRequeueRejected, messageListener::setDefaultRequeueRejected);
+			if (endpoint != null) {
+				JavaUtils.INSTANCE
+						.acceptIfNotNull(endpoint.getReplyPostProcessor(), messageListener::setReplyPostProcessor)
+						.acceptIfNotNull(endpoint.getReplyContentType(), messageListener::setReplyContentType);
+			}
 			messageListener.setConverterWinsContentType(endpoint.isConverterWinsContentType());
 		}
 	}