root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

BeanFactoryAdvisorRetrievalHelper avoids synchronization for name cache 

Issue: SPR-16570
This commit is contained in:
Juergen Hoeller 2018-07-24 16:16:44 +02:00
parent 47d8fe83df
commit 7f1a8d78b5
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
View File

@ -45,7 +45,7 @@ public class BeanFactoryAdvisorRetrievalHelper {
private final ConfigurableListableBeanFactory beanFactory; private final ConfigurableListableBeanFactory beanFactory;
@Nullable @Nullable
private String[] cachedAdvisorBeanNames; private volatile String[] cachedAdvisorBeanNames;
/** /**
@ -66,16 +66,13 @@ public class BeanFactoryAdvisorRetrievalHelper {
*/ */
public List<Advisor> findAdvisorBeans() { public List<Advisor> findAdvisorBeans() {
// Determine list of advisor bean names, if not cached already. // Determine list of advisor bean names, if not cached already.
String[] advisorNames = null; String[] advisorNames = this.cachedAdvisorBeanNames;
synchronized (this) { if (advisorNames == null) {
advisorNames = this.cachedAdvisorBeanNames; // Do not initialize FactoryBeans here: We need to leave all regular beans
if (advisorNames == null) { // uninitialized to let the auto-proxy creator apply to them!
// Do not initialize FactoryBeans here: We need to leave all regular beans advisorNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
// uninitialized to let the auto-proxy creator apply to them! this.beanFactory, Advisor.class, true, false);
advisorNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors( this.cachedAdvisorBeanNames = advisorNames;
this.beanFactory, Advisor.class, true, false);
this.cachedAdvisorBeanNames = advisorNames;
}
} }
if (advisorNames.length == 0) { if (advisorNames.length == 0) {
return new ArrayList<>(); return new ArrayList<>();