Perform the low cost check first

obourgain · obourgain · commit 27377580aa39 · 2025-04-04T09:03:09.000+02:00
Map lookup, while cheap, is still more expensive than instanceof.
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
@@ -1137,7 +1137,7 @@ public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 	public BeanDefinition getMergedBeanDefinition(String name) throws BeansException {
 		String beanName = transformedBeanName(name);
 		// Efficiently check whether bean definition exists in this factory.
-		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory parent) {
+		if (getParentBeanFactory() instanceof ConfigurableBeanFactory parent && !containsBeanDefinition(beanName)) {
 			return parent.getMergedBeanDefinition(beanName);
 		}
 		// Resolve merged bean definition locally.

Original file line number	Diff line number	Diff line change
`@@ -1137,7 +1137,7 @@ public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {`
`1137`	`1137`	`public BeanDefinition getMergedBeanDefinition(String name) throws BeansException {`
`1138`	`1138`	`String beanName = transformedBeanName(name);`
`1139`	`1139`	`// Efficiently check whether bean definition exists in this factory.`
`1140`		`- if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory parent) {`
	`1140`	`+ if (getParentBeanFactory() instanceof ConfigurableBeanFactory parent && !containsBeanDefinition(beanName)) {`
`1141`	`1141`	`return parent.getMergedBeanDefinition(beanName);`
`1142`	`1142`	`}`
`1143`	`1143`	`// Resolve merged bean definition locally.`