From 49ea7cb775d2292a1fbfcef746d1d65bc08ec6dc Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Fri, 11 Nov 2011 11:12:55 +0000
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0@Deprecated?=
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@256 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../dubbo/registry/dubbo/MockedClient.java    | 34 ++++++++-----------
 .../http/support/AbstractHttpServer.java      |  6 ----
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java b/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java
index f14e3976c..6257d0667 100644
--- a/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java
+++ b/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java
@@ -15,20 +15,19 @@
  */
 package com.alibaba.dubbo.registry.dubbo;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-
-import com.alibaba.dubbo.common.Parameters;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.remoting.Channel;
-import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Codec;
-import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.exchange.ExchangeClient;
-import com.alibaba.dubbo.remoting.exchange.ExchangeHandler;
-import com.alibaba.dubbo.remoting.exchange.ResponseCallback;
-import com.alibaba.dubbo.remoting.exchange.ResponseFuture;
-import com.alibaba.dubbo.remoting.exchange.support.Replier;
+import java.net.InetSocketAddress;
+import java.util.Map;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.remoting.Channel;
+import com.alibaba.dubbo.remoting.ChannelHandler;
+import com.alibaba.dubbo.remoting.Codec;
+import com.alibaba.dubbo.remoting.RemotingException;
+import com.alibaba.dubbo.remoting.exchange.ExchangeClient;
+import com.alibaba.dubbo.remoting.exchange.ExchangeHandler;
+import com.alibaba.dubbo.remoting.exchange.ResponseCallback;
+import com.alibaba.dubbo.remoting.exchange.ResponseFuture;
+import com.alibaba.dubbo.remoting.exchange.support.Replier;
 
 /**
  * MockedClient
@@ -257,11 +256,8 @@ public class MockedClient implements ExchangeClient {
     public void reset(URL url) {
     }
 
-    /* (non-Javadoc)
-     * @see com.alibaba.dubbo.common.Resetable#reset(com.alibaba.dubbo.common.Parameters)
-     */
-    public void reset(Parameters parameters) {
-        
+    @Deprecated
+    public void reset(com.alibaba.dubbo.common.Parameters parameters) {
     }
     
 }
\ No newline at end of file
diff --git a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java
index ea4e18208..295cb1885 100644
--- a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java
+++ b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java
@@ -17,7 +17,6 @@ package com.alibaba.dubbo.remoting.http.support;
 
 import java.net.InetSocketAddress;
 
-import com.alibaba.dubbo.common.Parameters;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.http.HttpHandler;
 import com.alibaba.dubbo.remoting.http.HttpServer;
@@ -57,11 +56,6 @@ public abstract class AbstractHttpServer implements HttpServer {
     public void reset(URL url) {
     }
     
-    @Deprecated
-    public void reset(Parameters parameters){
-        reset(getUrl().addParameters(parameters.getParameters()));
-    }
-
     public boolean isBound() {
         return true;
     }
-- 
GitLab