You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/01/05 02:27:28 UTC
[dubbo] branch 3.2 updated (ece5f4fb74 -> e87d896352)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from ece5f4fb74 Merge branch 'apache-3.1' into apache-3.2
add ad79c9e8fd Fix service instance update failed (#11236)
new e87d896352 Merge branch 'apache-3.1' into apache-3.2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dubbo/config/mock/MockServiceDiscovery.java | 14 +++----
.../spring/registry/MockServiceDiscovery.java | 12 +++---
.../kubernetes/KubernetesServiceDiscovery.java | 28 ++++++-------
.../kubernetes/KubernetesServiceDiscoveryTest.java | 28 ++++++-------
.../registry/client/AbstractServiceDiscovery.java | 24 ++++++-----
.../client/ReflectionBasedServiceDiscovery.java | 31 ++++++---------
.../client/support/MockServiceDiscovery.java | 10 ++---
.../multicast/MulticastServiceDiscovery.java | 10 ++---
.../registry/nacos/NacosServiceDiscovery.java | 12 +++---
.../zookeeper/ZookeeperServiceDiscovery.java | 46 ++++++++++++++--------
10 files changed, 113 insertions(+), 102 deletions(-)
[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e87d89635256a4106746c08fa824fba26f669ea9
Merge: ece5f4fb74 ad79c9e8fd
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Thu Jan 5 10:26:24 2023 +0800
Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
# dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java
# dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java
.../dubbo/config/mock/MockServiceDiscovery.java | 14 +++----
.../spring/registry/MockServiceDiscovery.java | 12 +++---
.../kubernetes/KubernetesServiceDiscovery.java | 28 ++++++-------
.../kubernetes/KubernetesServiceDiscoveryTest.java | 28 ++++++-------
.../registry/client/AbstractServiceDiscovery.java | 24 ++++++-----
.../client/ReflectionBasedServiceDiscovery.java | 31 ++++++---------
.../client/support/MockServiceDiscovery.java | 10 ++---
.../multicast/MulticastServiceDiscovery.java | 10 ++---
.../registry/nacos/NacosServiceDiscovery.java | 12 +++---
.../zookeeper/ZookeeperServiceDiscovery.java | 46 ++++++++++++++--------
10 files changed, 113 insertions(+), 102 deletions(-)
diff --cc dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java
index f19e1acd98,760ecfea7f..a35cc893e0
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java
@@@ -38,19 -50,8 +51,6 @@@ import org.apache.dubbo.rpc.model.Appli
import org.apache.dubbo.rpc.model.ScopeModelUtil;
import org.apache.dubbo.rpc.service.Destroyable;
- import java.util.Collections;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.LinkedList;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
- import java.util.concurrent.ConcurrentHashMap;
- import java.util.concurrent.ConcurrentMap;
- import java.util.concurrent.Executors;
- import java.util.concurrent.ScheduledExecutorService;
- import java.util.concurrent.TimeUnit;
-import com.alibaba.fastjson.JSONObject;
--
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_NOTIFY_EVENT;
public class ReflectionBasedServiceDiscovery extends AbstractServiceDiscovery {