SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2596 Ensure that bean propagation between binder and app context is timely

Browse Source 
Resolves #2596
This commit is contained in:
Oleg Zhurakousky
2023-01-06 08:40:50 +01:00
parent a9196584d2
commit e23a6078a7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java
View File

@@ -423,7 +423,6 @@ public class DefaultBinderFactory implements BinderFactory, DisposableBean, Appl
binderProducingContext.setParent(this.context);
}
else if (this.context != null) {
this.propagateSharedBeans((GenericApplicationContext) this.context, binderProducingContext);
binderProducingContext.addApplicationListener(new ApplicationListener<ApplicationEvent>() {
@Override
public void onApplicationEvent(ApplicationEvent event) {
@@ -455,14 +454,18 @@ public class DefaultBinderFactory implements BinderFactory, DisposableBean, Appl
if (refresh) {
binderProducingContext.refresh();
if (!useApplicationContextAsParent || "integration".equals(binderType.getDefaultName())) {
this.propagateSharedBeans((GenericApplicationContext) this.context, binderProducingContext);
}
}
if ("integration".equals(binderType.getDefaultName())) {
this.propagateSharedBeans((GenericApplicationContext) this.context, binderProducingContext);
}
return binderProducingContext;
}
private void propagateSharedBeans(GenericApplicationContext toContext, GenericApplicationContext fromContext) {
if (toContext == null) {
return;
}
GenericConversionService binderProducingConversionService = (GenericConversionService) toContext.getBeanFactory().getConversionService();
try {
Enumeration<URL> resources = ClassUtils.getDefaultClassLoader().getResources("META-INF/shared.beans");