Skip to content

Commit 67e3b1b

Browse files
chenqimiaosnicoll
authored andcommitted
Rename earlyProxyReferences in AbstractAutoProxyCreator
See gh-23914
1 parent 35ba53e commit 67e3b1b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ 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+
/** Cache of early target objects: cacheKey to bean instance. */
142+
private final Map<Object, Object> earlyTargetReferences = new ConcurrentHashMap<>(16);
142143

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

@@ -265,7 +266,7 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
265266
@Override
266267
public Object getEarlyBeanReference(Object bean, String beanName) {
267268
Object cacheKey = getCacheKey(bean.getClass(), beanName);
268-
this.earlyProxyReferences.put(cacheKey, bean);
269+
this.earlyTargetReferences.put(cacheKey, bean);
269270
return wrapIfNecessary(bean, beanName, cacheKey);
270271
}
271272

@@ -314,7 +315,7 @@ public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, Str
314315
public Object postProcessAfterInitialization(@Nullable Object bean, String beanName) {
315316
if (bean != null) {
316317
Object cacheKey = getCacheKey(bean.getClass(), beanName);
317-
if (this.earlyProxyReferences.remove(cacheKey) != bean) {
318+
if (this.earlyTargetReferences.remove(cacheKey) != bean) {
318319
return wrapIfNecessary(bean, beanName, cacheKey);
319320
}
320321
}

0 commit comments

Comments
 (0)