Fix rmi compatible problem

Ijava3028 · Jan 19, 2018 · 6d60624 · 6d60624
1 parent fe301f8
commit 6d60624
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Version.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Version.java
@@ -31,10 +31,9 @@
  */
 public final class Version {
 
+    private static final String DEFAULT_DUBBO_VERSION = "2.0.0";
     private static final Logger logger = LoggerFactory.getLogger(Version.class);
-    private static final String VERSION = getVersion(Version.class, "2.0.0");
-    private static final boolean INTERNAL = hasResource("com/alibaba/dubbo/registry/internal/RemoteRegistry.class");
-    private static final boolean COMPATIBLE = hasResource("com/taobao/remoting/impl/ConnectionRequest.class");
+    private static final String VERSION = getVersion(Version.class, DEFAULT_DUBBO_VERSION);
 
     static {
         // check if there's duplicated jar
@@ -48,13 +47,6 @@ public static String getVersion() {
         return VERSION;
     }
 
-    public static boolean isInternalVersion() {
-        return INTERNAL;
-    }
-
-    public static boolean isCompatibleVersion() {
-        return COMPATIBLE;
-    }
 
     private static boolean hasResource(String path) {
         try {

diff --git a/...c/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/...c/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
@@ -18,7 +18,6 @@
 
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.Version;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
 import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
@@ -342,8 +341,6 @@ private ExchangeClient initClient(URL url) {
         // client type setting.
         String str = url.getParameter(Constants.CLIENT_KEY, url.getParameter(Constants.SERVER_KEY, Constants.DEFAULT_REMOTING_CLIENT));
 
-        String version = url.getParameter(Constants.DUBBO_VERSION_KEY);
-        boolean compatible = (version != null && version.startsWith("1.0."));
         url = url.addParameter(Constants.CODEC_KEY, DubboCodec.NAME);
         // enable heartbeat by default
         url = url.addParameterIfAbsent(Constants.HEARTBEAT_KEY, String.valueOf(Constants.DEFAULT_HEARTBEAT));

diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java
@@ -16,9 +16,12 @@
  */
 package com.alibaba.dubbo.rpc.protocol.rmi;
 
+import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.Version;
 import com.alibaba.dubbo.rpc.RpcException;
 import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol;
+
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.remoting.RemoteAccessException;
 import org.springframework.remoting.rmi.RmiProxyFactoryBean;
@@ -71,11 +74,14 @@ public void run() {
     protected <T> T doRefer(final Class<T> serviceType, final URL url) throws RpcException {
         final RmiProxyFactoryBean rmiProxyFactoryBean = new RmiProxyFactoryBean();
         // RMI needs extra parameter since it uses customized remote invocation object
-        rmiProxyFactoryBean.setRemoteInvocationFactory(new RemoteInvocationFactory() {
-            public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-                return new RmiRemoteInvocation(methodInvocation);
-            }
-        });
+        if (url.getParameter(Constants.DUBBO_VERSION_KEY, Version.getVersion()).equals(Version.getVersion())) {
+            // Check dubbo version on provider, this feature only support
+            rmiProxyFactoryBean.setRemoteInvocationFactory(new RemoteInvocationFactory() {
+                public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
+                    return new RmiRemoteInvocation(methodInvocation);
+                }
+            });
+        }
         rmiProxyFactoryBean.setServiceUrl(url.toIdentityString());
         rmiProxyFactoryBean.setServiceInterface(serviceType);
         rmiProxyFactoryBean.setCacheStub(true);

diff --git a/pom.xml b/pom.xml
@@ -382,6 +382,10 @@ limitations under the License.
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
+                        <manifestEntries>
+                            <Specification-Version>2.0.0</Specification-Version>
+                            <Implementation-Version>2.0.1</Implementation-Version>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>