From 13a7a52c717e8b0570aada5ba6c4058b51394b21 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 17 Jun 2019 10:44:23 +0100
Subject: [PATCH] Revert "Work around Framework regression in handling of null
 model values"

This reverts commit 5fc67c545c7b7f6440bb0743feb15d5fc2c5d28a.

Closes gh-16991
---
 .../boot/web/reactive/error/DefaultErrorAttributes.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
index d30b94b14e7..eebc8ab8bba 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
@@ -83,8 +83,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
 		HttpStatus errorStatus = determineHttpStatus(error);
 		errorAttributes.put("status", errorStatus.value());
 		errorAttributes.put("error", errorStatus.getReasonPhrase());
-		String message = determineMessage(error);
-		errorAttributes.put("message", (message != null) ? message : "");
+		errorAttributes.put("message", determineMessage(error));
 		handleException(errorAttributes, determineException(error), includeStackTrace);
 		return errorAttributes;
 	}