You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ts...@apache.org on 2019/08/14 14:43:45 UTC
[dubbo] branch master updated: Fix use generic invocation via API ,
lost "version" value [#4784] (#4787)
This is an automated email from the ASF dual-hosted git repository.
tswstarplanet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 042327c Fix use generic invocation via API , lost "version" value [#4784] (#4787)
042327c is described below
commit 042327c2275e4be714c69c75be767a079a58968f
Author: zhuangpeng <zh...@corp.netease.com>
AuthorDate: Wed Aug 14 22:43:34 2019 +0800
Fix use generic invocation via API , lost "version" value [#4784] (#4787)
* Fix use generic invocation via API , lost "version" value [#4784]
* Modify unit test
---
.../org/apache/dubbo/rpc/cluster/support/ClusterUtils.java | 10 ++++++++--
.../org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java | 8 ++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
index 17ae72d..ac81e9b 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
@@ -81,10 +81,16 @@ public class ClusterUtils {
if (localMap != null && localMap.size() > 0) {
Map<String, String> copyOfLocalMap = new HashMap<>(localMap);
- copyOfLocalMap.remove(GROUP_KEY);
+
+ if(map.containsKey(GROUP_KEY)){
+ copyOfLocalMap.remove(GROUP_KEY);
+ }
+ if(map.containsKey(VERSION_KEY)){
+ copyOfLocalMap.remove(VERSION_KEY);
+ }
+
copyOfLocalMap.remove(RELEASE_KEY);
copyOfLocalMap.remove(DUBBO_VERSION_KEY);
- copyOfLocalMap.remove(VERSION_KEY);
copyOfLocalMap.remove(METHODS_KEY);
copyOfLocalMap.remove(TIMESTAMP_KEY);
copyOfLocalMap.remove(TAG_KEY);
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
index 1c2b520..a72e4c9 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
@@ -133,8 +133,8 @@ public class ClusterUtilsTest {
remoteURL = URL.valueOf("dubbo://localhost:20880/DemoService");
mergedUrl = ClusterUtils.mergeUrl(remoteURL, localURL.getParameters());
- Assertions.assertNull(mergedUrl.getParameter(VERSION_KEY));
- Assertions.assertNull(mergedUrl.getParameter(GROUP_KEY));
+ Assertions.assertEquals(mergedUrl.getParameter(VERSION_KEY),localURL.getParameter(VERSION_KEY));
+ Assertions.assertEquals(mergedUrl.getParameter(GROUP_KEY),localURL.getParameter(GROUP_KEY));
Assertions.assertNull(mergedUrl.getParameter(DUBBO_VERSION_KEY));
Assertions.assertNull(mergedUrl.getParameter(RELEASE_KEY));
Assertions.assertNull(mergedUrl.getParameter(METHODS_KEY));
@@ -147,8 +147,8 @@ public class ClusterUtilsTest {
remoteURL = URL.valueOf("dubbo://localhost:20880/DemoService?key=value");
mergedUrl = ClusterUtils.mergeUrl(remoteURL, localURL.getParameters());
- Assertions.assertNull(mergedUrl.getParameter(VERSION_KEY));
- Assertions.assertNull(mergedUrl.getParameter(GROUP_KEY));
+ Assertions.assertEquals(mergedUrl.getParameter(VERSION_KEY),localURL.getParameter(VERSION_KEY));
+ Assertions.assertEquals(mergedUrl.getParameter(GROUP_KEY),localURL.getParameter(GROUP_KEY));
Assertions.assertNull(mergedUrl.getParameter(DUBBO_VERSION_KEY));
Assertions.assertNull(mergedUrl.getParameter(RELEASE_KEY));
Assertions.assertNull(mergedUrl.getParameter(METHODS_KEY));