You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/03/28 03:06:23 UTC
[dubbo-go] 02/02: fix conflicts
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit c1558f1a67a4778fb2b626abe2336ae83998d091
Author: chickenlj <ke...@gmail.com>
AuthorDate: Tue Mar 28 11:06:06 2023 +0800
fix conflicts
---
metadata/report/nacos/report.go | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/metadata/report/nacos/report.go b/metadata/report/nacos/report.go
index 2b753f770..d63a88dcd 100644
--- a/metadata/report/nacos/report.go
+++ b/metadata/report/nacos/report.go
@@ -244,18 +244,15 @@ func (n *nacosMetadataReport) RegisterServiceAppMapping(key string, group string
DataId: key,
Group: group,
})
- if err != nil {
- return err
- }
- oldApps := strings.Split(oldVal, constant.CommaSeparator)
- if len(oldApps) > 0 {
- for _, app := range oldApps {
- if app == value {
- return nil
+ if oldVal != "" {
+ oldApps := strings.Split(oldVal, constant.CommaSeparator)
+ if len(oldApps) > 0 {
+ for _, app := range oldApps {
+ if app == value {
+ return nil
+ }
}
}
- }
- if oldVal != "" {
value = oldVal + constant.CommaSeparator + value
}
return n.storeMetadata(vo.ConfigParam{