You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@dubbo.apache.org by li...@apache.org on 2020/07/23 02:46:08 UTC

[dubbo] 01/03: Merge branch 'master' of https://github.com/apache/dubbo

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 7645134e5a217da1c8b0c62a7eb07cfe9140cc25
Merge: cd34cc5 f798140
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Jul 8 14:21:04 2020 +0800

    Merge branch 'master' of https://github.com/apache/dubbo

 .../dubbo/config/bootstrap/DubboBootstrap.java     | 10 +++--
 .../spring/context/annotation/EnableDubbo.java     |  2 +-
 .../context/annotation/EnableDubboConfig.java      |  2 +-
 .../demo/consumer/comp/DemoServiceComponent.java   |  4 +-
 .../dubbo/demo/provider/DemoServiceImpl.java       |  4 +-
 .../remoting/http/tomcat/TomcatHttpServer.java     |  3 +-
 .../serialize/hessian2/Hessian2ObjectInput.java    |  3 +-
 .../serialize/hessian2/Hessian2ObjectOutput.java   |  3 +-
 .../hessian2/Hessian2SerializerFactory.java        | 31 +---------------
 .../dubbo/AbstractHessian2FactoryInitializer.java  | 30 +++++++--------
 .../dubbo/DefaultHessian2FactoryInitializer.java   | 24 +++---------
 .../hessian2/dubbo/Hessian2FactoryInitializer.java | 43 ++++++++++++++++++++++
 .../WhitelistHessian2FactoryInitializer.java}      | 38 +++++++------------
 ...alize.hessian2.dubbo.Hessian2FactoryInitializer |  2 +
 14 files changed, 97 insertions(+), 102 deletions(-)