From b7a5dc6a780eef197ae77e1fb5af613832499b2b Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Wed, 26 Oct 2011 02:49:44 +0000
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A8=A1=E5=9D=97?=
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@54 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../main/java/com/alibaba/dubbo/config/ReferenceConfig.java  | 3 +--
 .../java/com/alibaba/dubbo/config/spring/ReferenceBean.java  | 3 +--
 .../com/alibaba/dubbo/callback/explicit/test/Server.java     | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index a24ea82dd7..0b070d2741 100644
--- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -45,7 +45,6 @@ import com.alibaba.dubbo.rpc.cluster.Cluster;
 import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory;
 import com.alibaba.dubbo.rpc.cluster.support.AvailableCluster;
 import com.alibaba.dubbo.rpc.cluster.support.ClusterUtils;
-import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol;
 import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
@@ -257,7 +256,7 @@ public class ReferenceConfig<T> extends AbstractConsumerConfig {
             j = consumer.isInjvm();
         }
         if (j != null && j) {
-            URL url = new URL(InjvmProtocol.NAME, NetUtils.LOCALHOST, InjvmProtocol.DEFAULT_PORT, interfaceClass.getName()).addParameters(map);
+            URL url = new URL("injvm", NetUtils.LOCALHOST, 1, interfaceClass.getName()).addParameters(map);
             invoker = protocol.refer(interfaceClass, url);
             if (logger.isInfoEnabled()) {
                 logger.info("Using injvm service " + interfaceClass.getName());
diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java
index a7e3be1aa5..f0b5905510 100644
--- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java
+++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java
@@ -31,7 +31,6 @@ import com.alibaba.dubbo.config.ProtocolConfig;
 import com.alibaba.dubbo.config.ReferenceConfig;
 import com.alibaba.dubbo.config.RegistryConfig;
 import com.alibaba.dubbo.config.ServiceConfig;
-import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol;
 
 /**
  * ReferenceFactoryBean
@@ -125,7 +124,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> implements FactoryBean,
                             protocols = serviceConfig.getProvider().getProtocols();
                         }
                         for (ProtocolConfig protocol : protocols) {
-                            if (InjvmProtocol.NAME.equals(protocol.getName())) {
+                            if ("injvm".equals(protocol.getName())) {
                                 setInjvm(true);
                                 break;
                             }
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/callback/explicit/test/Server.java b/dubbo-config/src/test/java/com/alibaba/dubbo/callback/explicit/test/Server.java
index 7c032e281e..c1c7f6da0f 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/callback/explicit/test/Server.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/callback/explicit/test/Server.java
@@ -21,15 +21,14 @@ import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
-import com.alibaba.dubbo.rpc.protocol.dubbo.DubboCodec;
 
 public class Server {
     private static ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
     private static Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
     
     public final static URL serviceURL =  URL.valueOf("dubbo://127.0.0.1:20880/"+IDemoService.class.getName()+"?group=test" 
-                +"&"+Constants.CODEC_KEY+"="+DubboCodec.NAME
-                +"&"+Constants.DOWNSTREAM_CODEC_KEY+"="+DubboCodec.NAME
+                +"&"+Constants.CODEC_KEY+"=dubbo"
+                +"&"+Constants.DOWNSTREAM_CODEC_KEY+"=dubbo"
                 +"&xxx.0.callback=true"
                 +"&timeout="+Integer.MAX_VALUE
 //                uncomment is unblock invoking