Skip to content

Commit 8f6d24e

Browse files
committed
Merge pull request #23914 from chenqimiao
* pr/23914: Polish "Rename earlyProxyReferences in AbstractAutoProxyCreator" Rename earlyProxyReferences in AbstractAutoProxyCreator Closes gh-23914
2 parents 35ba53e + 5d5cd17 commit 8f6d24e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
138138

139139
private final Set<String> targetSourcedBeans = Collections.newSetFromMap(new ConcurrentHashMap<>(16));
140140

141-
private final Map<Object, Object> earlyProxyReferences = new ConcurrentHashMap<>(16);
141+
private final Map<Object, Object> earlyBeanReferences = new ConcurrentHashMap<>(16);
142142

143143
private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<>(16);
144144

@@ -265,7 +265,7 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
265265
@Override
266266
public Object getEarlyBeanReference(Object bean, String beanName) {
267267
Object cacheKey = getCacheKey(bean.getClass(), beanName);
268-
this.earlyProxyReferences.put(cacheKey, bean);
268+
this.earlyBeanReferences.put(cacheKey, bean);
269269
return wrapIfNecessary(bean, beanName, cacheKey);
270270
}
271271

@@ -314,7 +314,7 @@ public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, Str
314314
public Object postProcessAfterInitialization(@Nullable Object bean, String beanName) {
315315
if (bean != null) {
316316
Object cacheKey = getCacheKey(bean.getClass(), beanName);
317-
if (this.earlyProxyReferences.remove(cacheKey) != bean) {
317+
if (this.earlyBeanReferences.remove(cacheKey) != bean) {
318318
return wrapIfNecessary(bean, beanName, cacheKey);
319319
}
320320
}

0 commit comments

Comments
 (0)