GH-1491: Fix Possible NPE

garyrussell · garyrussell · commit 0a6a60638c78 · 2022-08-10T09:37:23.000-04:00
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/RabbitListenerAnnotationBeanPostProcessor.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/RabbitListenerAnnotationBeanPostProcessor.java
@@ -18,7 +18,6 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
-import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -100,6 +99,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.validation.Validator;
 
@@ -1055,11 +1055,15 @@ public Object resolveArgument(MethodParameter parameter, Message<?> message) thr
 			}
 			catch (MethodArgumentNotValidException ex) {
 				if (message.getPayload().equals(Optional.empty())) {
-					Type type = parameter.getGenericParameterType();
-					List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
-					if (allErrors.size() == 1
-							&& allErrors.get(0).getDefaultMessage().equals("Payload value must not be empty")) {
-						return Optional.empty();
+					BindingResult bindingResult = ex.getBindingResult();
+					if (bindingResult != null) {
+						List<ObjectError> allErrors = bindingResult.getAllErrors();
+						if (allErrors.size() == 1) {
+							String defaultMessage = allErrors.get(0).getDefaultMessage();
+							if ("Payload value must not be empty".equals(defaultMessage)) {
+								return Optional.empty();
+							}
+						}
 					}
 				}
 				throw ex;
