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/incubator-dubbo.git
commit 48f34fe96883b43c185948080177d514460c70ae Merge: a45206c e201004 Author: Huxing Zhang <[email protected]> AuthorDate: Thu May 17 16:16:20 2018 +0800 Merge branch 'graceful-shutdown-in-tomcat' of https://github.com/ralf0131/dubbo into ralf0131-graceful-shutdown-in-tomcat all/pom.xml | 8 ++ dubbo-bootstrap/pom.xml | 47 ++++++++ .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 133 +++++++++++++++++++++ .../alibaba/dubbo/common/utils/ExecutorUtil.java | 10 +- .../com/alibaba/dubbo/config/AbstractConfig.java | 12 -- .../com/alibaba/dubbo/config/ProtocolConfig.java | 25 ---- .../com/alibaba/dubbo/config/RegistryConfig.java | 11 +- .../alibaba/dubbo/config/ProtocolConfigTest.java | 10 -- ...onfigTest.java => ProtocolConfigTest.java.orig} | 12 +- dubbo-config/dubbo-config-spring/pom.xml | 14 +++ .../initializer/DubboApplicationListener.java | 45 +++++++ .../DubboWebApplicationInitializer.java | 40 +++++++ .../dubbo/registry/support/FailbackRegistry.java | 9 +- .../dubbo/registry/dubbo/DubboRegistry.java | 13 +- .../registry/multicast/MulticastRegistry.java | 2 + .../dubbo/registry/redis/RedisRegistry.java | 2 + pom.xml | 1 + 17 files changed, 325 insertions(+), 69 deletions(-) diff --cc dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java index c9d9046,fb105dd..4d10c72 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java @@@ -17,8 -17,6 +17,7 @@@ package com.alibaba.dubbo.config; - import com.alibaba.dubbo.common.extension.ExtensionLoader; +import com.alibaba.dubbo.config.mock.MockProtocol2; import com.alibaba.dubbo.rpc.Protocol; import org.junit.Test; import org.mockito.Mockito; diff --cc dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig index c9d9046,fb105dd..c22910b --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig +++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java.orig @@@ -17,8 -17,6 +17,11 @@@ package com.alibaba.dubbo.config; ++<<<<<<< HEAD +import com.alibaba.dubbo.common.extension.ExtensionLoader; +import com.alibaba.dubbo.config.mock.MockProtocol2; ++======= ++>>>>>>> e201004e985f3ae43ee8c65baa16bcc0aecc0000 import com.alibaba.dubbo.rpc.Protocol; import org.junit.Test; import org.mockito.Mockito; -- To stop receiving notification emails like this one, please contact [email protected].
