|
|
|
@ -1,5 +1,5 @@ |
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2018 the original author or authors. |
|
|
|
|
* Copyright 2002-2019 the original author or authors. |
|
|
|
|
* |
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
@ -133,7 +133,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport |
|
|
|
|
|
|
|
|
|
private final Set<String> targetSourcedBeans = Collections.newSetFromMap(new ConcurrentHashMap<>(16)); |
|
|
|
|
|
|
|
|
|
private final Set<Object> earlyProxyReferences = Collections.newSetFromMap(new ConcurrentHashMap<>(16)); |
|
|
|
|
private final Map<Object, Object> earlyProxyReferences = new ConcurrentHashMap<>(16); |
|
|
|
|
|
|
|
|
|
private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<>(16); |
|
|
|
|
|
|
|
|
@ -236,9 +236,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport |
|
|
|
|
@Override |
|
|
|
|
public Object getEarlyBeanReference(Object bean, String beanName) { |
|
|
|
|
Object cacheKey = getCacheKey(bean.getClass(), beanName); |
|
|
|
|
if (!this.earlyProxyReferences.contains(cacheKey)) { |
|
|
|
|
this.earlyProxyReferences.add(cacheKey); |
|
|
|
|
} |
|
|
|
|
this.earlyProxyReferences.put(cacheKey, bean); |
|
|
|
|
return wrapIfNecessary(bean, beanName, cacheKey); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -297,7 +295,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport |
|
|
|
|
public Object postProcessAfterInitialization(@Nullable Object bean, String beanName) { |
|
|
|
|
if (bean != null) { |
|
|
|
|
Object cacheKey = getCacheKey(bean.getClass(), beanName); |
|
|
|
|
if (!this.earlyProxyReferences.contains(cacheKey)) { |
|
|
|
|
if (this.earlyProxyReferences.remove(cacheKey) != bean) { |
|
|
|
|
return wrapIfNecessary(bean, beanName, cacheKey); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|