natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error when register dubbo bootstrap application listener in hsf consumer bean (#8410)

This commit is contained in:
Gong Dewei 2021-08-03 23:44:23 +08:00 committed by GitHub
parent 5d60b34d08
commit 63baa5c043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboBootstrapApplicationListener.java
View File

@ -82,7 +82,11 @@ public class DubboBootstrapApplicationListener implements ApplicationListener, A
private void initDubboConfigBeans() {
// load DubboConfigBeanInitializer to init config beans
applicationContext.getBean(DubboConfigBeanInitializer.BEAN_NAME, DubboConfigBeanInitializer.class);
if (applicationContext.containsBean(DubboConfigBeanInitializer.BEAN_NAME)) {
applicationContext.getBean(DubboConfigBeanInitializer.BEAN_NAME, DubboConfigBeanInitializer.class);
} else {
logger.warn("Bean '" + DubboConfigBeanInitializer.BEAN_NAME + "' was not found");
}
// All infrastructure config beans are loaded, initialize dubbo here
DubboBootstrap.getInstance().initialize();
@ -138,6 +142,10 @@ public class DubboBootstrapApplicationListener implements ApplicationListener, A
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
checkCallStackAndInit();
}
private void checkCallStackAndInit() {
// check call stack whether contains org.springframework.context.support.AbstractApplicationContext.registerListeners()
Exception exception = new Exception();
StackTraceElement[] stackTrace = exception.getStackTrace();
@ -148,13 +156,13 @@ public class DubboBootstrapApplicationListener implements ApplicationListener, A
break;
}
}
if (!found) {
if (found) {
// init config beans here, compatible with spring 3.x/4.1.x
initDubboConfigBeans();
} else {
logger.warn("DubboBootstrapApplicationListener initialization is unexpected, " +
"it should be created in AbstractApplicationContext.registerListeners() method", exception);
"it should be created in AbstractApplicationContext.registerListeners() method", exception);
}
// init config beans here, compatible with spring 3.x/4.1.x
initDubboConfigBeans();
}
public ApplicationContext getApplicationContext() {