From 61adf2dd255b2b32ccba7f051f8b11f40b567056 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 28 Jun 2024 18:09:39 +0200 Subject: [PATCH] Formal null safety for exception message through String.valueOf See gh-33117 --- .../factory/support/AbstractAutowireCapableBeanFactory.java | 3 ++- .../beans/factory/support/AbstractBeanFactory.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 6569f446fec..ae9656818cc 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -853,7 +853,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac } } catch (IllegalArgumentException ex) { - throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName, ex.getMessage()); + throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName, + String.valueOf(ex.getMessage())); } // For instance supplied beans, try the target type and bean class immediately 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 9d9ba6cc463..824d86e29e2 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 @@ -1723,7 +1723,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp } } catch (IllegalArgumentException ex) { - throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName, ex.getMessage()); + throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName, + String.valueOf(ex.getMessage())); } if (allowInit && mbd.isSingleton()) {