Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.BeansException;
Expand Down Expand Up @@ -132,7 +133,8 @@ private boolean rebind(String name, ApplicationContext appContext) {
// TODO: determine a more general approach to fix this.
// see
// https://github.com/spring-cloud/spring-cloud-commons/issues/571
if (getNeverRefreshable().contains(bean.getClass().getName()) || getNeverRefreshable().contains(name)) {
Class<?> beanClass = AopProxyUtils.ultimateTargetClass(bean);
if (getNeverRefreshable().contains(beanClass.getName()) || getNeverRefreshable().contains(name)) {
return false; // ignore
}
appContext.getAutowireCapableBeanFactory().destroyBean(bean);
Expand Down
Loading