From 825d1ced69d841a1d6a3e708b087048081ce9603 Mon Sep 17 00:00:00 2001 From: "william.liangf" Date: Tue, 15 Nov 2011 05:58:52 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@276 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../support/FailbackClusterInvokerTest.java | 2 +- .../java/com/alibaba/dubbo/common/Parameters.java | 2 +- .../java/com/alibaba/dubbo/config/ConfigTest.java | 2 +- .../com/alibaba/dubbo/config/delay-fixed-time.xml | 15 +++++++++++++++ .../alibaba/dubbo/config/delay-on-initialized.xml | 15 +++++++++++++++ .../dubbo/config/multi-protocol-default.xml | 15 +++++++++++++++ .../alibaba/dubbo/config/multi-protocol-error.xml | 15 +++++++++++++++ .../dubbo/config/multi-protocol-register.xml | 15 +++++++++++++++ .../com/alibaba/dubbo/config/multi-protocol.xml | 15 +++++++++++++++ .../com/alibaba/dubbo/config/multi-registry.xml | 15 +++++++++++++++ .../registry/dubbo/RegistryDirectoryTest.java | 2 +- .../dubbo/registry/support/CacheRegistry.java | 2 +- .../dubbo/registry/support/FailbackRegistry.java | 2 +- .../rpc/protocol/dubbo/support/ProtocolUtils.java | 2 +- .../dubbo/telnet/ChangeTelnetHandlerTest.java | 4 ++-- .../dubbo/telnet/CurrentTelnetHandlerTest.java | 4 ++-- .../dubbo/telnet/InvokerTelnetHandlerTest.java | 4 ++-- .../dubbo/telnet/ListTelnetHandlerTest.java | 4 ++-- .../dubbo/telnet/LogTelnetHandlerTest.java | 4 ++-- .../dubbo/telnet/PortTelnetHandlerTest.java | 4 ++-- .../protocol/hessian/HttpClientConnection.java | 2 +- .../hessian/HttpClientConnectionFactory.java | 2 +- .../rpc/protocol/hessian/HessianProtocolTest.java | 2 +- .../rpc/protocol/hessian/HessianService.java | 2 +- .../rpc/protocol/hessian/HessianServiceImpl.java | 2 +- .../dubbo/rpc/protocol/rmi/RmiProxyFactory.java | 2 +- .../protocol/rmi/proxy/DubboRmiProxyFactory.java | 2 +- .../protocol/rmi/proxy/NativeProxyFactory.java | 2 +- .../rmi/proxy/RmiProxyFactoryAdaptive.java | 2 +- .../dubbo/rpc/proxy/AbstractProxyFactory.java | 2 +- 30 files changed, 134 insertions(+), 29 deletions(-) diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java b/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java index 00e23a973..5d558c81f 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java @@ -149,4 +149,4 @@ public class FailbackClusterInvokerTest { invoker.retryFailed();// when retry the invoker which get from failed map already is not the mocked invoker,so // it can be invoke successfully } -} +} \ No newline at end of file diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java index 363bf8167..449132b32 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2101 Alibaba Group. + * 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. diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java index 5a91c51e5..39519b892 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java @@ -163,4 +163,4 @@ public class ConfigTest { } } -} +} \ No newline at end of file diff --git a/dubbo-config/src/test/resources/com/alibaba/dubbo/config/delay-fixed-time.xml b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/delay-fixed-time.xml index 58c170fd2..62d22b4e0 100644 --- a/dubbo-config/src/test/resources/com/alibaba/dubbo/config/delay-fixed-time.xml +++ b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/delay-fixed-time.xml @@ -1,3 +1,18 @@ + serviceType, URL url); -} +} \ No newline at end of file diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java index 59732c96a..f373a01f9 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/DubboRmiProxyFactory.java @@ -137,4 +137,4 @@ public class DubboRmiProxyFactory implements RmiProxyFactory { } } -} +} \ No newline at end of file diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java index 847ef3921..915029840 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/NativeProxyFactory.java @@ -82,4 +82,4 @@ public class NativeProxyFactory implements RmiProxyFactory { return proxyFactory.getInvoker((T) remote, serviceType, url); } -} +} \ No newline at end of file diff --git a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/RmiProxyFactoryAdaptive.java b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/RmiProxyFactoryAdaptive.java index a33e6b8eb..37ce73b4d 100644 --- a/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/RmiProxyFactoryAdaptive.java +++ b/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/proxy/RmiProxyFactoryAdaptive.java @@ -59,4 +59,4 @@ public class RmiProxyFactoryAdaptive implements RmiProxyFactory { return true; } -} +} \ No newline at end of file diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java index b62c20401..3ee576b32 100644 --- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java +++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java @@ -51,4 +51,4 @@ public abstract class AbstractProxyFactory implements ProxyFactory { public abstract T getProxy(Invoker invoker, Class[] types); -} +} \ No newline at end of file -- GitLab