This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 9e20a5ac9d0474e008b67559a1cfcd97aebf6e55 Merge: fcb4aa5f5f d04f03a942 Author: Albumen Kevin <[email protected]> AuthorDate: Mon Oct 24 12:41:50 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java .github/workflows/build-and-test-pr.yml | 74 ++++++++++++---------- .github/workflows/build-and-test-scheduled-3.0.yml | 55 ++++++++-------- .github/workflows/build-and-test-scheduled-3.1.yml | 71 +++++++++++---------- .github/workflows/build-and-test-scheduled-3.2.yml | 71 +++++++++++---------- .../common/constants/LoggerCodeConstants.java | 2 + .../apache/dubbo/config/context/ConfigManager.java | 8 +++ .../dubbo/config/utils/ConfigValidationUtils.java | 14 +++- .../config/utils/ConfigValidationUtilsTest.java | 67 +++++++++++++++++++- .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 4 ++ .../src/main/resources/dubbo.properties | 4 +- .../dubbo/remoting/transport/AbstractServer.java | 2 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 12 ++-- ...oDefaultPropertiesEnvironmentPostProcessor.java | 2 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 12 ++-- 14 files changed, 249 insertions(+), 149 deletions(-) diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java index 78b141db94,8934fb77ac..f3ead4f3f6 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java @@@ -168,8 -164,8 +168,10 @@@ public interface LoggerCodeConstants String TRANSPORT_CLIENT_CONNECT_TIMEOUT = "6-2"; + String INTERNAL_SERVICE_CONFIG_ERROR = "6-3"; + + // Internal unknown error. + String INTERNAL_ERROR = "99-0"; String INTERNAL_INTERRUPTED = "99-1";
