root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid NPE against null value from toString call 

Closes gh-27782
This commit is contained in:
Juergen Hoeller 2021-12-14 16:46:42 +01:00
parent 0802581aff
commit ac581bed92
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
View File

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