Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix spring status check failed #10534

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Fix spring status check failed #10534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47b5df5
fix spring status check failed
CrazyHZM Sep 2, 2022
d8bb787
fix spring status check failed
CrazyHZM Sep 2, 2022
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
22 changes: 5 additions & 17 deletions ...onfig-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,6 @@ public SpringStatusChecker(ApplicationContext applicationContext) {

@Override
public Status check() {
// TODO It seems to be ok with GenericWebApplicationContext, need further confirmation
// ApplicationContext context = null;
// for (ApplicationContext c : SpringExtensionInjector.getContexts()) {
// // [Issue] SpringStatusChecker execute errors on non-XML Spring configuration
// // issue : https://github.com/apache/dubbo/issues/3615
// if(c instanceof GenericWebApplicationContext) { // ignore GenericXmlApplicationContext
// continue;
// }
//
// if (c != null) {
// context = c;
// break;
// }
// }

if (applicationContext == null && applicationModel != null) {
SpringExtensionInjector springExtensionInjector = SpringExtensionInjector.get(applicationModel);
Expand Down Expand Up @@ -110,10 +96,12 @@ public Status check() {
}
}
}
} catch (UnsupportedOperationException t) {
logger.debug(t.getMessage(), t);
} catch (Throwable t) {
logger.warn(t.getMessage(), t);
if (t.getCause() instanceof UnsupportedOperationException){
logger.debug(t.getMessage(), t);
}else {
logger.warn(t.getMessage(), t);
}
}
return new Status(level, buf.toString());
}
Expand Down