This is an automated email from the ASF dual-hosted git repository. huxing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push: new 10ef042 replace hardcode with regex pattern (#4810) 10ef042 is described below commit 10ef042b697fb4d5d3b4280495eab13dee17fe4f Author: anLA7856 <luoan...@gmail.com> AuthorDate: Sat Aug 17 07:34:48 2019 +0800 replace hardcode with regex pattern (#4810) --- .../main/java/org/apache/dubbo/common/constants/CommonConstants.java | 2 ++ .../src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java index d4f0bf8..15720ac 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java @@ -54,6 +54,8 @@ public interface CommonConstants { Pattern REGISTRY_SPLIT_PATTERN = Pattern.compile("\\s*[|;]+\\s*"); + Pattern D_REGISTRY_SPLIT_PATTERN = Pattern.compile("\\s*[|]+\\s*"); + String SEMICOLON_SEPARATOR = ";"; Pattern SEMICOLON_SPLIT_PATTERN = Pattern.compile("\\s*[;]+\\s*"); diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java index 0aa009c..0755fcb 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java @@ -69,6 +69,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.SHUTDOWN_WAIT_SE import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL; +import static org.apache.dubbo.common.constants.CommonConstants.D_REGISTRY_SPLIT_PATTERN; import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader; import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY; import static org.apache.dubbo.config.Constants.LAYER_KEY; @@ -597,7 +598,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig { String address = ConfigUtils.getProperty("dubbo.registry.address"); if (address != null && address.length() > 0) { List<RegistryConfig> tmpRegistries = new ArrayList<RegistryConfig>(); - String[] as = address.split("\\s*[|]+\\s*"); + String[] as = D_REGISTRY_SPLIT_PATTERN.split(address); for (String a : as) { RegistryConfig registryConfig = new RegistryConfig(); registryConfig.setAddress(a);