|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
* Copyright 2002-2020 the original author or authors. |
|
|
|
* Copyright 2002-2021 the original author or authors. |
|
|
|
* |
|
|
|
* |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
@ -46,6 +46,7 @@ import org.springframework.beans.factory.FactoryBean; |
|
|
|
import org.springframework.beans.factory.config.ConfigurableBeanFactory; |
|
|
|
import org.springframework.beans.factory.config.ConfigurableBeanFactory; |
|
|
|
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; |
|
|
|
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; |
|
|
|
import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor; |
|
|
|
import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor; |
|
|
|
|
|
|
|
import org.springframework.core.SmartClassLoader; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
@ -458,7 +459,11 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport |
|
|
|
proxyFactory.setPreFiltered(true); |
|
|
|
proxyFactory.setPreFiltered(true); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return proxyFactory.getProxy(getProxyClassLoader()); |
|
|
|
ClassLoader targetClassLoader = getProxyClassLoader(); |
|
|
|
|
|
|
|
if (targetClassLoader instanceof SmartClassLoader && targetClassLoader != beanClass.getClassLoader()) { |
|
|
|
|
|
|
|
targetClassLoader = ((SmartClassLoader) targetClassLoader).getOriginalClassLoader(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return proxyFactory.getProxy(targetClassLoader); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
|