Restore restrictive getTypeForFactoryBeanFromAttributes check

See gh-29799 See gh-30987
spring-projects · Aug 3, 2023 · a6ff95a · a6ff95a
1 parent f7c3e64
commit a6ff95a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...s/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/...s/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
@@ -73,13 +73,17 @@ protected Class<?> getTypeForFactoryBean(FactoryBean<?> factoryBean) {
 	 */
 	ResolvableType getTypeForFactoryBeanFromAttributes(AttributeAccessor attributes) {
 		Object attribute = attributes.getAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE);
+		if (attribute == null) {
+			return ResolvableType.NONE;
+		}
 		if (attribute instanceof ResolvableType resolvableType) {
 			return resolvableType;
 		}
 		if (attribute instanceof Class<?> clazz) {
 			return ResolvableType.forClass(clazz);
 		}
-		return ResolvableType.NONE;
+		throw new IllegalArgumentException("Invalid value type for attribute '" +
+				FactoryBean.OBJECT_TYPE_ATTRIBUTE + "': " + attribute.getClass().getName());
 	}
 
 	/**