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 2021/06/25 04:42:20 UTC
[dubbo] branch 3.0.1-release updated (9a0dc62 -> 6d56c2e)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.0.1-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 9a0dc62 Fix ut in ServiceConfigTest
new 108f9d5 Revert ServiceConfig changes
add d93db7a [3.0] router add getter method (#8139)
add f488cb3 [3.0] Add service config to bootstrap when init (#8138)
new 6d56c2e Merge remote-tracking branch 'apache/3.0' into 3.0.1-release
The 2 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:
.../main/java/org/apache/dubbo/rpc/cluster/RouterChain.java | 4 ++++
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 4 ++--
.../test/java/org/apache/dubbo/config/ServiceConfigTest.java | 12 ++----------
.../org/apache/dubbo/config/mock/MockServiceListener.java | 5 +++++
4 files changed, 13 insertions(+), 12 deletions(-)
[dubbo] 01/02: Revert ServiceConfig changes
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0.1-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 108f9d57459c148d66fd291a071a3a78ae4439c0
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jun 25 12:41:45 2021 +0800
Revert ServiceConfig changes
---
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 1 -
.../src/test/java/org/apache/dubbo/config/ServiceConfigTest.java | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 270d91f..8d5893b 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -210,7 +210,6 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
public synchronized void export() {
if (this.shouldExport() && !this.exported) {
this.init();
- this.bootstrap.service(this);
// check bootstrap state
if (!bootstrap.isInitialized()) {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index 30b59c3..a4c6a62 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -357,8 +357,7 @@ public class ServiceConfigTest {
service.export();
Map<String, ServiceConfig> exportedServices = mockServiceListener.getExportedServices();
- // MetadataService, DemoService
- assertEquals(2, exportedServices.size());
+ assertEquals(1, exportedServices.size());
ServiceConfig serviceConfig = exportedServices.get(service.getUniqueServiceName());
assertSame(service, serviceConfig);
}
[dubbo] 02/02: Merge remote-tracking branch 'apache/3.0' into
3.0.1-release
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0.1-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 6d56c2eb630fbe82541a6ebe83b79a8ff307d299
Merge: 108f9d5 f488cb3
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jun 25 12:41:53 2021 +0800
Merge remote-tracking branch 'apache/3.0' into 3.0.1-release
.../src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java | 4 ++++
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 3 ++-
.../src/test/java/org/apache/dubbo/config/ServiceConfigTest.java | 9 +--------
.../java/org/apache/dubbo/config/mock/MockServiceListener.java | 5 +++++
4 files changed, 12 insertions(+), 9 deletions(-)