From 01c8de0111806d8f9346f332b22ece9dd9fef618 Mon Sep 17 00:00:00 2001 From: Anton Lyxell Date: Sat, 31 Jul 2021 16:27:43 +0200 Subject: [PATCH] Simplify getInternalBeanFactoryForBean This commit simplifies getInternalBeanFactoryForBean() in AbstractBeanFactoryBasedTargetSourceCreator via Map::computeIfAbsent. Closes gh-27234 --- .../AbstractBeanFactoryBasedTargetSourceCreator.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java index 4fd173f289..c18899db28 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java @@ -125,12 +125,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator */ protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) { synchronized (this.internalBeanFactories) { - DefaultListableBeanFactory internalBeanFactory = this.internalBeanFactories.get(beanName); - if (internalBeanFactory == null) { - internalBeanFactory = buildInternalBeanFactory(this.beanFactory); - this.internalBeanFactories.put(beanName, internalBeanFactory); - } - return internalBeanFactory; + return this.internalBeanFactories.computeIfAbsent(beanName, k -> buildInternalBeanFactory(this.beanFactory)); } }