From ae879965bb5bc35d799f2bdaefbcf4fd530c4ac4 Mon Sep 17 00:00:00 2001 From: "william.liangf" Date: Wed, 15 Feb 2012 13:03:44 +0000 Subject: [PATCH] =?UTF-8?q?DUBBO-54=20=E6=94=B9=E4=B8=BA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=BA=A7=E5=8F=82=E6=95=B0?= 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@977 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../dubbo/rpc/cluster/support/MergeableClusterInvoker.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java index b24c4e0354..d383a7cf9f 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java @@ -56,8 +56,9 @@ public class MergeableClusterInvoker implements Invoker { this.directory = directory; } + @SuppressWarnings("unchecked") public Result invoke(final Invocation invocation) throws RpcException { - int timeout = getUrl().getParameter( Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT ); + int timeout = getUrl().getMethodParameter(invocation.getMethodName(), Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT); List> invokers = directory.list(invocation); Map> results = new HashMap>(); @@ -94,7 +95,7 @@ public class MergeableClusterInvoker implements Invoker { if ( result == null ) { result = r.getResult(); } else { - String merger = getUrl().getParameter( Constants.MERGER_KEY ); + String merger = getUrl().getMethodParameter(invocation.getMethodName(), Constants.MERGER_KEY); if ( merger != null && ! "".equals( merger.trim() ) ) { Method method = returnType.getMethod( merger, returnType ); if ( method != null ) {