GH-1207: Fix NPE

garyrussell · garyrussell · commit 519a2c94ed80 · 2020-06-18T12:31:59.000-04:00
Resolves #1207 Cherry-pick to 2.2.x
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
@@ -141,7 +141,7 @@ protected void invokeHandlerAndProcessResult(@Nullable org.springframework.amqp.
 		}
 		InvocationResult result = null;
 		try {
-			if (this.messagingMessageConverter.method == null) {
+			if (this.messagingMessageConverter.method == null && amqpMessage != null) {
 				amqpMessage.getMessageProperties()
 						.setTargetMethod(this.handlerAdapter.getMethodFor(message.getPayload()));
 			}

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ protected void invokeHandlerAndProcessResult(@Nullable org.springframework.amqp.`
`141`	`141`	`}`
`142`	`142`	`InvocationResult result = null;`
`143`	`143`	`try {`
`144`		`- if (this.messagingMessageConverter.method == null) {`
	`144`	`+ if (this.messagingMessageConverter.method == null && amqpMessage != null) {`
`145`	`145`	`amqpMessage.getMessageProperties()`
`146`	`146`	`.setTargetMethod(this.handlerAdapter.getMethodFor(message.getPayload()));`
`147`	`147`	`}`