From 6ee2100c81e04d090e7a7869f4862fcb4899b275 Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 12:48:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?DUBBO-459=20skip=20unused=20stream=E6=97=B6?= =?UTF-8?q?=E4=BB=85=E5=9C=A8stream=E4=B8=AD=E8=BF=98=E6=9C=89=E6=9C=AA?= =?UTF-8?q?=E8=AF=BB=E6=95=B0=E6=8D=AE=E6=97=B6=E6=89=8D=E6=89=93log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remoting/exchange/codec/ExchangeCodec.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java index 8bb5acd11e..3462ca107c 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java @@ -207,13 +207,15 @@ public class ExchangeCodec extends TelnetCodec { return req; } } finally { - try { - if (logger.isWarnEnabled()) { - logger.warn("Skip input stream " + is.available()); - } - StreamUtils.skipUnusedStream(is); - } catch (IOException e) { - logger.warn(e.getMessage(), e); + if (is.available() > 0) { + try { + if (logger.isWarnEnabled()) { + logger.warn("Skip input stream " + is.available()); + } + StreamUtils.skipUnusedStream(is); + } catch (IOException e) { + logger.warn(e.getMessage(), e); + } } } } From dc1a4ee136b86e3d94fdb3b131c72f14be5d85fa Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 12:50:30 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA=202.3.2-SNAPSHOT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 4 ++-- dubbo-container/dubbo-container-api/pom.xml | 2 +- dubbo-container/dubbo-container-jetty/pom.xml | 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml | 4 ++-- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-examples/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 4 ++-- dubbo-filter/dubbo-filter-cache/pom.xml | 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 4 ++-- dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +- dubbo-monitor/pom.xml | 4 ++-- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +- dubbo-registry/dubbo-registry-redis/pom.xml | 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +- dubbo-registry/pom.xml | 4 ++-- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +- dubbo-remoting/pom.xml | 4 ++-- dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-default/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 4 ++-- dubbo-simple/dubbo-monitor-simple/pom.xml | 2 +- dubbo-simple/dubbo-registry-simple/pom.xml | 2 +- dubbo-simple/pom.xml | 4 ++-- dubbo-test/dubbo-test-benchmark/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml | 2 +- dubbo-test/dubbo-test-integration/pom.xml | 2 +- dubbo-test/pom.xml | 4 ++-- dubbo/pom.xml | 2 +- pom.xml | 2 +- 55 files changed, 65 insertions(+), 65 deletions(-) diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 1bfe67d447..9fe68d7347 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-cluster jar diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index dbf9aa4eec..09623bee17 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-common jar diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 3d96b6ac09..530f92ee5f 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-config - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-config-api jar diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index a6dd03a317..1f8a45fa7e 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-config - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-config-spring jar diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index 0b95cfcab8..45effb8cee 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-config - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The config module of dubbo project diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index 109c77f746..d3b603d8c9 100644 --- a/dubbo-container/dubbo-container-api/pom.xml +++ b/dubbo-container/dubbo-container-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-container - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-container-api jar diff --git a/dubbo-container/dubbo-container-jetty/pom.xml b/dubbo-container/dubbo-container-jetty/pom.xml index fba0cff793..305d28b7d6 100644 --- a/dubbo-container/dubbo-container-jetty/pom.xml +++ b/dubbo-container/dubbo-container-jetty/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-container - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-container-jetty jar diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml index 32c9af6aac..451012b6e2 100644 --- a/dubbo-container/dubbo-container-log4j/pom.xml +++ b/dubbo-container/dubbo-container-log4j/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-container - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-container-log4j jar diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml index 756619a431..022e65247f 100644 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ b/dubbo-container/dubbo-container-spring/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-container - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-container-spring jar diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml index 7a7877007a..6e290f8281 100644 --- a/dubbo-container/pom.xml +++ b/dubbo-container/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-container - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The container module of dubbo project diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index 1dc6f11ae5..cd4a6a2efc 100644 --- a/dubbo-demo/dubbo-demo-api/pom.xml +++ b/dubbo-demo/dubbo-demo-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-demo - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-demo-api jar diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index bf473d336f..63eccc5187 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-demo - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-demo-consumer jar diff --git a/dubbo-demo/dubbo-demo-examples/pom.xml b/dubbo-demo/dubbo-demo-examples/pom.xml index 2bba7ec0e5..71c0ea8d43 100644 --- a/dubbo-demo/dubbo-demo-examples/pom.xml +++ b/dubbo-demo/dubbo-demo-examples/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-demo - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-demo-examples jar diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index 986e3bf249..6e9a99eb7c 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-demo - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-demo-provider jar diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index 24fb488d23..7d43168bc9 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-demo - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The demo module of dubbo project diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml index e8311474a6..c3e164c314 100644 --- a/dubbo-filter/dubbo-filter-cache/pom.xml +++ b/dubbo-filter/dubbo-filter-cache/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-filter - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-filter-cache jar diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml index bdd428d3a5..8d1e169c90 100644 --- a/dubbo-filter/dubbo-filter-validation/pom.xml +++ b/dubbo-filter/dubbo-filter-validation/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-filter - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-filter-validation jar diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml index 715debb2f0..c91e0112b6 100644 --- a/dubbo-filter/pom.xml +++ b/dubbo-filter/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-filter - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The filter module of dubbo project diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml index b6bcb55d12..2e7e863f5f 100644 --- a/dubbo-monitor/dubbo-monitor-api/pom.xml +++ b/dubbo-monitor/dubbo-monitor-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-monitor - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-monitor-api jar diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml index 5fe1ca51dd..afe19e3714 100644 --- a/dubbo-monitor/dubbo-monitor-default/pom.xml +++ b/dubbo-monitor/dubbo-monitor-default/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-monitor - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-monitor-default jar diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml index c614a034ea..8fbadc8688 100644 --- a/dubbo-monitor/pom.xml +++ b/dubbo-monitor/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-monitor - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The monitor module of dubbo project diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index ca9fa219d8..da63a863e7 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-api jar diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml index 55d21c55fb..afd969cc99 100644 --- a/dubbo-registry/dubbo-registry-default/pom.xml +++ b/dubbo-registry/dubbo-registry-default/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-default jar diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml index 5523b5ff7e..aac8d97359 100644 --- a/dubbo-registry/dubbo-registry-multicast/pom.xml +++ b/dubbo-registry/dubbo-registry-multicast/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-multicast jar diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml index e005ad9510..e94d6a8542 100644 --- a/dubbo-registry/dubbo-registry-redis/pom.xml +++ b/dubbo-registry/dubbo-registry-redis/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-redis jar diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml index cd281e03d5..57b5f8386d 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml +++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-zookeeper jar diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index b6cfdac207..7979f8ed71 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The registry module of dubbo project diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index 8e987ecbf2..6edbd21285 100644 --- a/dubbo-remoting/dubbo-remoting-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-api jar diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml index 5d26d76a20..270dfa2b94 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-grizzly jar diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index 7a8d3136be..eb87a2bd1d 100644 --- a/dubbo-remoting/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting/dubbo-remoting-http/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-http jar diff --git a/dubbo-remoting/dubbo-remoting-mina/pom.xml b/dubbo-remoting/dubbo-remoting-mina/pom.xml index 6e872d66a0..247a1e7b3f 100644 --- a/dubbo-remoting/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting/dubbo-remoting-mina/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-mina jar diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index 9897876e6e..d19207ec4e 100644 --- a/dubbo-remoting/dubbo-remoting-netty/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-netty jar diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml index 393fbba3b3..e3388fbed1 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-p2p jar diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml index ac9843c99c..fe281d112b 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting-zookeeper jar diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index 8cace2e8c0..6172a55589 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-remoting - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The remoting module of dubbo project diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index f5120303ea..23571bc002 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-api jar diff --git a/dubbo-rpc/dubbo-rpc-default/pom.xml b/dubbo-rpc/dubbo-rpc-default/pom.xml index 489e251da5..8ee42bbbe2 100644 --- a/dubbo-rpc/dubbo-rpc-default/pom.xml +++ b/dubbo-rpc/dubbo-rpc-default/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-default jar diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-rpc/dubbo-rpc-hessian/pom.xml index 2f4d741975..337dbeeced 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-hessian jar diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml index 3d02f6b9d0..e340e7667b 100644 --- a/dubbo-rpc/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc/dubbo-rpc-http/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-http jar diff --git a/dubbo-rpc/dubbo-rpc-injvm/pom.xml b/dubbo-rpc/dubbo-rpc-injvm/pom.xml index 1d5e15c0ac..1a88cf9842 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/pom.xml +++ b/dubbo-rpc/dubbo-rpc-injvm/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-injvm jar diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml index f060e3d07d..55e135ec81 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/pom.xml +++ b/dubbo-rpc/dubbo-rpc-memcached/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-memcached jar diff --git a/dubbo-rpc/dubbo-rpc-redis/pom.xml b/dubbo-rpc/dubbo-rpc-redis/pom.xml index 77409654d6..ea8af2e08d 100644 --- a/dubbo-rpc/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc/dubbo-rpc-redis/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-redis jar diff --git a/dubbo-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-rpc/dubbo-rpc-rmi/pom.xml index a1979e35d1..4bceac241d 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rmi/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-rmi jar diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml index c2ffd01c66..36b3f1fa89 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-thrift jar diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-rpc/dubbo-rpc-webservice/pom.xml index 6ddff06933..4c6cc6fc15 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc-webservice jar diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml index 19bf325022..c45c677f9b 100644 --- a/dubbo-rpc/pom.xml +++ b/dubbo-rpc/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-rpc - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The rpc module of dubbo project diff --git a/dubbo-simple/dubbo-monitor-simple/pom.xml b/dubbo-simple/dubbo-monitor-simple/pom.xml index 3e9206158b..b418097661 100644 --- a/dubbo-simple/dubbo-monitor-simple/pom.xml +++ b/dubbo-simple/dubbo-monitor-simple/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-simple - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-monitor-simple jar diff --git a/dubbo-simple/dubbo-registry-simple/pom.xml b/dubbo-simple/dubbo-registry-simple/pom.xml index 01e5983e75..4772318943 100644 --- a/dubbo-simple/dubbo-registry-simple/pom.xml +++ b/dubbo-simple/dubbo-registry-simple/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-simple - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-registry-simple jar diff --git a/dubbo-simple/pom.xml b/dubbo-simple/pom.xml index 539600e938..8891245a8a 100644 --- a/dubbo-simple/pom.xml +++ b/dubbo-simple/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-simple - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The simple implementation module of dubbo project diff --git a/dubbo-test/dubbo-test-benchmark/pom.xml b/dubbo-test/dubbo-test-benchmark/pom.xml index 78823d64bc..d5124b0092 100644 --- a/dubbo-test/dubbo-test-benchmark/pom.xml +++ b/dubbo-test/dubbo-test-benchmark/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-test - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-test-benchmark jar diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml index 98945044ae..8d9327e43b 100644 --- a/dubbo-test/dubbo-test-compatibility/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-test - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-test-compatibility jar diff --git a/dubbo-test/dubbo-test-integration/pom.xml b/dubbo-test/dubbo-test-integration/pom.xml index 9018aff8dd..e2755c04ff 100644 --- a/dubbo-test/dubbo-test-integration/pom.xml +++ b/dubbo-test/dubbo-test-integration/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-test - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-test-integration jar diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 5c9773b890..6adc9a42c2 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -19,10 +19,10 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo-test - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The test module of dubbo project diff --git a/dubbo/pom.xml b/dubbo/pom.xml index 6bf48745eb..58d4b419b9 100644 --- a/dubbo/pom.xml +++ b/dubbo/pom.xml @@ -19,7 +19,7 @@ com.alibaba dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT dubbo jar diff --git a/pom.xml b/pom.xml index 1bd7db4823..537cd6f3bc 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.0 dubbo-parent - 2.4.0-SNAPSHOT + 2.3.2-SNAPSHOT pom ${project.artifactId} The parent project of dubbo From 6002838cf7a80f1d9fd230051e5977e0d0e8e183 Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 12:53:51 +0800 Subject: [PATCH 3/8] rm dubbo-admin --- dubbo-admin/pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 dubbo-admin/pom.xml diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml deleted file mode 100644 index 5ee4970917..0000000000 --- a/dubbo-admin/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.alibaba - dubbo-parent - 2.4.0-SNAPSHOT - - dubbo-admin - 2.4.0-SNAPSHOT - pom - ${project.artifactId} - The admin module of dubbo project - - true - - From f74e7d9c83319b97cdec7cb8791577bbef41c8ba Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 13:26:15 +0800 Subject: [PATCH 4/8] =?UTF-8?q?DUBBO-452=20=E6=B7=BB=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dubbo/config/spring/ConfigTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java index 7001acd181..a15edce58d 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java @@ -32,6 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.common.extension.ExtensionLoader; import com.alibaba.dubbo.common.utils.NetUtils; +import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.config.ApplicationConfig; import com.alibaba.dubbo.config.ConsumerConfig; import com.alibaba.dubbo.config.ProtocolConfig; @@ -51,6 +52,8 @@ import com.alibaba.dubbo.rpc.Filter; import com.alibaba.dubbo.rpc.RpcContext; import com.alibaba.dubbo.rpc.RpcException; +import junit.framework.Assert; + /** * ConfigTest @@ -804,4 +807,35 @@ public class ConfigTest { } } + @Test + public void testDubboProtocolPortOverride() throws Exception { + String dubboPort = System.getProperty("dubbo.protocol.dubbo.port"); + int port = 55555; + System.setProperty("dubbo.protocol.dubbo.port", String.valueOf(port)); + try { + ApplicationConfig application = new ApplicationConfig(); + application.setName("dubbo-protocol-port-override"); + + RegistryConfig registry = new RegistryConfig(); + registry.setAddress("N/A"); + + ProtocolConfig protocol = new ProtocolConfig(); + protocol.setName("dubbo"); + + ServiceConfig service = new ServiceConfig(); + service.setInterface(DemoService.class); + service.setRef(new DemoServiceImpl()); + service.setApplication(application); + service.setRegistry(registry); + service.setProtocol(protocol); + service.export(); + + Assert.assertEquals(port, service.getExportedUrls().get(0).getPort()); + } finally { + if (StringUtils.isNotEmpty(dubboPort)) { + System.setProperty("dubbo.protocol.dubbo.port", dubboPort); + } + } + } + } \ No newline at end of file From 82a362f0f9a8fd6d7acbff50e0ff320161e30e7a Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 13:40:05 +0800 Subject: [PATCH 5/8] DUBBO-452 --- .../java/com/alibaba/dubbo/config/spring/ConfigTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java index a15edce58d..61ff3108a2 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java @@ -812,6 +812,7 @@ public class ConfigTest { String dubboPort = System.getProperty("dubbo.protocol.dubbo.port"); int port = 55555; System.setProperty("dubbo.protocol.dubbo.port", String.valueOf(port)); + ServiceConfig service = null; try { ApplicationConfig application = new ApplicationConfig(); application.setName("dubbo-protocol-port-override"); @@ -822,7 +823,7 @@ public class ConfigTest { ProtocolConfig protocol = new ProtocolConfig(); protocol.setName("dubbo"); - ServiceConfig service = new ServiceConfig(); + service = new ServiceConfig(); service.setInterface(DemoService.class); service.setRef(new DemoServiceImpl()); service.setApplication(application); @@ -835,6 +836,9 @@ public class ConfigTest { if (StringUtils.isNotEmpty(dubboPort)) { System.setProperty("dubbo.protocol.dubbo.port", dubboPort); } + if (service != null) { + service.unexport(); + } } } From cf18a37e1c1bd96230543dcf52090874d889e918 Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 16:42:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?DUBBO-445=20provider=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E7=AB=AF=E5=8F=A3=EF=BC=8C=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BC=80=E5=90=AF=E4=BA=86=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/dubbo/config/ServiceConfig.java | 22 ++++++++- .../dubbo/config/spring/ConfigTest.java | 48 +++++++++++++++++++ .../dubbo/config/spring/api/HelloService.java | 24 ++++++++++ .../config/spring/impl/HelloServiceImpl.java | 29 +++++++++++ 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java create mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java index 16c4f22460..0f80b4bf10 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java @@ -61,6 +61,8 @@ public class ServiceConfig extends AbstractServiceConfig { private static final ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension(); + private static final Map RANDOM_PORT_MAP = new HashMap(); + // 接口类型 private String interfaceName; @@ -315,7 +317,11 @@ public class ServiceConfig extends AbstractServiceConfig { port = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).getDefaultPort(); } if (port == null || port <= 0) { - port = NetUtils.getAvailablePort(); + port = getRandomPort(name); + if (port == null || port < 0) { + port = NetUtils.getAvailablePort(); + putRandomPort(name, port); + } logger.warn("Use random available port(" + port + ") for protocol " + name); } Map map = new HashMap(); @@ -654,4 +660,18 @@ public class ServiceConfig extends AbstractServiceConfig { return provider; } + private static Integer getRandomPort(String protocol) { + protocol = protocol.toLowerCase(); + if (RANDOM_PORT_MAP.containsKey(protocol)) { + return RANDOM_PORT_MAP.get(protocol); + } + return Integer.MIN_VALUE; + } + + private static void putRandomPort(String protocol, Integer port) { + protocol = protocol.toLowerCase(); + if (!RANDOM_PORT_MAP.containsKey(protocol)) { + RANDOM_PORT_MAP.put(protocol, port); + } + } } \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java index 61ff3108a2..f0a7dc3ab5 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java @@ -44,8 +44,10 @@ import com.alibaba.dubbo.config.spring.action.DemoActionByAnnotation; import com.alibaba.dubbo.config.spring.action.DemoActionBySetter; import com.alibaba.dubbo.config.spring.annotation.consumer.AnnotationAction; import com.alibaba.dubbo.config.spring.api.DemoService; +import com.alibaba.dubbo.config.spring.api.HelloService; import com.alibaba.dubbo.config.spring.filter.MockFilter; import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl; +import com.alibaba.dubbo.config.spring.impl.HelloServiceImpl; import com.alibaba.dubbo.registry.RegistryService; import com.alibaba.dubbo.rpc.Exporter; import com.alibaba.dubbo.rpc.Filter; @@ -842,4 +844,50 @@ public class ConfigTest { } } + @Test + public void testProtocolRandomPort() throws Exception { + ServiceConfig demoService = null; + ServiceConfig helloService = null; + + ApplicationConfig application = new ApplicationConfig(); + application.setName("test-protocol-random-port"); + + RegistryConfig registry = new RegistryConfig(); + registry.setAddress("N/A"); + + ProtocolConfig protocol = new ProtocolConfig(); + protocol.setName("dubbo"); + protocol.setPort(-1); + + demoService = new ServiceConfig(); + demoService.setInterface(DemoService.class); + demoService.setRef(new DemoServiceImpl()); + demoService.setApplication(application); + demoService.setRegistry(registry); + demoService.setProtocol(protocol); + + helloService = new ServiceConfig(); + helloService.setInterface(HelloService.class); + helloService.setRef(new HelloServiceImpl()); + helloService.setApplication(application); + helloService.setRegistry(registry); + helloService.setProtocol(protocol); + + try { + demoService.export(); + helloService.export(); + + Assert.assertEquals(demoService.getExportedUrls().get(0).getPort(), + helloService.getExportedUrls().get(0).getPort()); + } finally { + unexportService(demoService); + unexportService(helloService); + } + } + + private static void unexportService(ServiceConfig config) { + if (config != null) { + config.unexport(); + } + } } \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java new file mode 100644 index 0000000000..3bd41cffac --- /dev/null +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java @@ -0,0 +1,24 @@ +/* + * Copyright 1999-2011 Alibaba Group. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.dubbo.config.spring.api; + +/** + * @author kimi + */ +public interface HelloService { + String sayHello(String name); +} diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java new file mode 100644 index 0000000000..51ac887725 --- /dev/null +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java @@ -0,0 +1,29 @@ +/* + * Copyright 1999-2011 Alibaba Group. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.dubbo.config.spring.impl; + +import com.alibaba.dubbo.config.spring.api.HelloService; + +/** + * @author kimi + */ +public class HelloServiceImpl implements HelloService { + + public String sayHello(String name) { + return "Hello, " + name; + } +} From e0db71da2a36db3b0bc886c1144932562a5a9296 Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 29 Jun 2012 16:47:12 +0800 Subject: [PATCH 7/8] =?UTF-8?q?DUBBO-452=20=E7=AB=AF=E5=8F=A3-D=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/alibaba/dubbo/config/ServiceConfig.java | 3 +++ .../test/java/com/alibaba/dubbo/config/spring/ConfigTest.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java index 0f80b4bf10..d9fcf5a4c0 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java @@ -497,6 +497,9 @@ public class ServiceConfig extends AbstractServiceConfig { setProtocol(new ProtocolConfig()); } for (ProtocolConfig protocolConfig : protocols) { + if (StringUtils.isEmpty(protocolConfig.getName())) { + protocolConfig.setName("dubbo"); + } appendProperties(protocolConfig); } } diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java index f0a7dc3ab5..c3c3d2460c 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java @@ -823,7 +823,6 @@ public class ConfigTest { registry.setAddress("N/A"); ProtocolConfig protocol = new ProtocolConfig(); - protocol.setName("dubbo"); service = new ServiceConfig(); service.setInterface(DemoService.class); From c4030ada95b28ee12f8b0e8c490c785a1e8e1f7f Mon Sep 17 00:00:00 2001 From: oldrat Date: Fri, 29 Jun 2012 17:29:02 +0800 Subject: [PATCH 8/8] add *.log to git ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 361fea480e..3f36f1679d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ target *.iml *.iws .idea/ -dubbo.log +*.log