Fix spring status check failed (#10534)
* fix spring status check failed
Signed-off-by: crazyhzm <crazyhzm@gmail.com>
* fix spring status check failed
Signed-off-by: crazyhzm <crazyhzm@gmail.com>
Signed-off-by: crazyhzm <crazyhzm@gmail.com>
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java
index d83398b..ebb8075 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java
@@ -51,20 +51,6 @@
@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);
@@ -110,10 +96,12 @@
}
}
}
- } 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());
}
