Formal null safety for exception message through String.valueOf

See gh-33117
spring-projects · Jun 28, 2024 · 61adf2d · 61adf2d
1 parent 61894af
commit 61adf2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -853,7 +853,8 @@ protected ResolvableType getTypeForFactoryBean(String beanName, RootBeanDefiniti
 			}
 		}
 		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/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1723,7 +1723,8 @@ protected ResolvableType getTypeForFactoryBean(String beanName, RootBeanDefiniti
 			}
 		}
 		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()) {