From ac581bed92181ce8ddfe629e94629a52e3dc972a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:42 +0100
Subject: [PATCH] Avoid NPE against null value from toString call

Closes gh-27782
---
 .../java/org/springframework/core/log/LogFormatUtils.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index 9a2693e2ce..550a202255 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.logging.Log;
 
 import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Utility methods for formatting and logging messages.
@@ -71,10 +72,10 @@ public abstract class LogFormatUtils {
 		}
 		String result;
 		try {
-			result = value.toString();
+			result = ObjectUtils.nullSafeToString(value);
 		}
 		catch (Throwable ex) {
-			result = ex.toString();
+			result = ObjectUtils.nullSafeToString(ex);
 		}
 		if (maxLength != -1) {
 			result = (result.length() > maxLength ? result.substring(0, maxLength) + " (truncated)..." : result);