From 47ff92873bc35345a0e0a743be4939527a27f896 Mon Sep 17 00:00:00 2001
From: Ippei Nawate <2648453+sakuna63@users.noreply.github.com>
Date: Mon, 6 May 2019 18:51:28 +0900
Subject: [PATCH] Add null check

---
 .../web/reactive/result/method/InvocableHandlerMethod.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
index cedc262c5a..f1ac283d65 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -216,7 +216,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
 
 		// Leave stack trace for later, if error is not handled..
 		String message = cause.getMessage();
-		if (!message.contains(parameter.getExecutable().toGenericString())) {
+		if (message != null && !message.contains(parameter.getExecutable().toGenericString())) {
 			if (logger.isDebugEnabled()) {
 				logger.debug(exchange.getLogPrefix() + formatArgumentError(parameter, message));
 			}