From 5d96a2dc9e78070eb338842f0e3304e8460a3f5d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 25 Aug 2020 16:26:23 +0200
Subject: [PATCH] Defensive null handling for exception message

See gh-24878
---
 .../beans/factory/support/AbstractBeanFactory.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 841023b55b..76e65cab0c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -386,7 +386,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			}
 			catch (BeansException ex) {
 				beanCreation.tag("exception", ex.getClass().toString());
-				beanCreation.tag("message", ex.getMessage());
+				beanCreation.tag("message", String.valueOf(ex.getMessage()));
 				cleanupAfterBeanCreationFailure(beanName);
 				throw ex;
 			}