You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/09/02 09:55:11 UTC
[dubbo] branch 3.1 updated: Fix spring status check failed (#10534)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new bb7f942c5d Fix spring status check failed (#10534)
bb7f942c5d is described below
commit bb7f942c5dc1649ff8e0be939639280e44c731a7
Author: huazhongming <cr...@gmail.com>
AuthorDate: Fri Sep 2 17:54:27 2022 +0800
Fix spring status check failed (#10534)
* fix spring status check failed
Signed-off-by: crazyhzm <cr...@gmail.com>
* fix spring status check failed
Signed-off-by: crazyhzm <cr...@gmail.com>
Signed-off-by: crazyhzm <cr...@gmail.com>
---
.../config/spring/status/SpringStatusChecker.java | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
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 d83398b390..ebb807553a 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 @@ public class SpringStatusChecker implements StatusChecker {
@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 @@ public class SpringStatusChecker implements StatusChecker {
}
}
}
- } 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());
}