[dubbo-go] branch 3.1 updated: fix conflict

[liujun]

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


The following commit(s) were added to refs/heads/3.1 by this push:
     new 3c831fbaa fix conflict
3c831fbaa is described below

commit 3c831fbaa924de37df0928576450866be361ef5c
Author: chickenlj <ken.lj...@gmail.com>
AuthorDate: Tue Mar 28 14:37:17 2023 +0800

    fix conflict
---
 registry/servicediscovery/service_discovery_registry.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/registry/servicediscovery/service_discovery_registry.go 
b/registry/servicediscovery/service_discovery_registry.go
index 5266f4c26..0b719eeaf 100644
--- a/registry/servicediscovery/service_discovery_registry.go
+++ b/registry/servicediscovery/service_discovery_registry.go
@@ -209,7 +209,6 @@ func (s *ServiceDiscoveryRegistry) Subscribe(url 
*common.URL, notify registry.No
        mappingListener := NewMappingListener(s.url, url, s.subscribedServices, 
notify)
        services := s.getServices(url, mappingListener)
        if services.Empty() {
-               return nil
                return perrors.Errorf("Should has at least one way to know 
which services this interface belongs to,"+
                        " either specify 'provided-by' for reference or enable 
metadata-report center subscription url:%s", url.String())
        }