This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 5c88dcb229d3de614dc8b508168bbbff1e5ab7f6 Merge: d20dc68 d727461 Author: ken.lj <[email protected]> AuthorDate: Wed Jul 17 14:40:28 2019 +0800 Merge branch 'master' of https://github.com/apache/incubator-dubbo .../rpc/cluster/loadbalance/RandomLoadBalance.java | 15 +- .../main/java/org/apache/dubbo/common/Version.java | 19 +- .../extension/AdaptiveClassCodeGenerator.java | 765 ++++----- .../dubbo/common/extension/ExtensionLoader.java | 15 +- .../dubbo/common/utils/CompatibleTypeUtils.java | 2 + .../org/apache/dubbo/common/utils/MethodUtils.java | 23 + .../org/apache/dubbo/common/utils/PojoUtils.java | 1 + .../apache/dubbo/common/utils/PojoUtilsTest.java | 1718 ++++++++++---------- .../apache/dubbo/common/version/VersionTest.java | 7 + .../org/apache/dubbo/config/MethodConfigTest.java | 4 +- .../org/apache/dubbo/config/AbstractConfig.java | 26 +- .../dubbo/config/AbstractInterfaceConfig.java | 6 +- .../org/apache/dubbo/config/ReferenceConfig.java | 2 +- .../org/apache/dubbo/config/RegistryConfig.java | 20 +- .../apache/dubbo/config/RegistryConfigTest.java | 12 +- .../annotation/DubboConfigConfiguration.java | 7 +- .../zookeeper/ZookeeperDynamicConfiguration.java | 8 +- dubbo-dependencies-bom/pom.xml | 4 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- .../registry/integration/RegistryProtocol.java | 2 +- .../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 13 +- .../zookeeper/curator/CuratorZookeeperClient.java | 4 +- .../apache/dubbo/rpc/filter/AccessLogFilter.java | 4 +- .../dubbo/rpc/filter/AccessLogFilterTest.java | 20 +- pom.xml | 2 +- 25 files changed, 1407 insertions(+), 1294 deletions(-) diff --cc dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java index 6231e61,e52a24e..096b71c --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java @@@ -30,8 -30,8 +30,9 @@@ import org.slf4j.LoggerFactory import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.Executors; + import java.util.concurrent.TimeUnit; +import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR; import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY; /**
