Skip to content

Commit 32cebcb

Browse files
committed
GH-1016 - Observability proxying now uses original bean class loader.
Original issue: spring-projects/spring-data-rest#2438.
1 parent 2e31447 commit 32cebcb

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

Diff for: spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleObservabilitySupport.java

+2-13
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.aop.framework.ProxyFactory;
2323
import org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator;
2424
import org.springframework.beans.BeansException;
25-
import org.springframework.beans.factory.BeanClassLoaderAware;
2625
import org.springframework.beans.factory.BeanFactory;
2726
import org.springframework.beans.factory.BeanFactoryAware;
2827
import org.springframework.lang.Nullable;
@@ -31,20 +30,10 @@
3130
/**
3231
* @author Oliver Drotbohm
3332
*/
34-
class ModuleObservabilitySupport implements BeanClassLoaderAware, BeanFactoryAware {
33+
class ModuleObservabilitySupport implements BeanFactoryAware {
3534

36-
private ClassLoader classLoader;
3735
private @Nullable AbstractAutoProxyCreator creator;
3836

39-
/*
40-
* (non-Javadoc)
41-
* @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
42-
*/
43-
@Override
44-
public void setBeanClassLoader(ClassLoader classLoader) {
45-
this.classLoader = classLoader;
46-
}
47-
4837
/*
4938
* (non-Javadoc)
5039
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
@@ -77,7 +66,7 @@ protected final Object addAdvisor(Object bean, Advisor advisor, Consumer<ProxyFa
7766
customizer.accept(factory);
7867
factory.addAdvisor(advisor);
7968

80-
return factory.getProxy(classLoader);
69+
return factory.getProxy(bean.getClass().getClassLoader());
8170
}
8271
}
8372

0 commit comments

Comments
 (0)