[incubator-servicecomb-service-center] branch master updated: SCB-857 Provider rule of consumer can not be removed (#429)

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asifdxtreme pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 77ae91e  SCB-857 Provider rule of consumer can not be removed (#429)
77ae91e is described below

commit 77ae91e5adc580861358a814096dd0f824073dc5
Author: little-cui <su...@qq.com>
AuthorDate: Thu Aug 23 15:51:13 2018 +0800

    SCB-857 Provider rule of consumer can not be removed (#429)
---
 server/service/util/dependency_util.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/service/util/dependency_util.go b/server/service/util/dependency_util.go
index 288aeea..0041130 100644
--- a/server/service/util/dependency_util.go
+++ b/server/service/util/dependency_util.go
@@ -444,13 +444,13 @@ loop:
 				continue loop
 			}
 
-			id := apt.GenerateProviderDependencyRuleKey(domainProject, key)
+			id := apt.GenerateProviderDependencyRuleKey(key.Tenant, key)
 			exist, ok := cache[id]
 			if !ok {
 				_, exist, err = FindServiceIds(ctx, key.Version, key)
 				if err != nil {
 					return nil, fmt.Errorf("%v, find service %s/%s/%s/%s",
-						err, domainProject, key.AppId, key.ServiceName, key.Version)
+						err, key.Tenant, key.AppId, key.ServiceName, key.Version)
 				}
 				cache[id] = exist
 			}
@@ -497,7 +497,7 @@ func removeProviderRuleKeys(ctx context.Context, domainProject string, cache map
 			_, exist, err = FindServiceIds(ctx, key.Version, key)
 			if err != nil {
 				return nil, fmt.Errorf("find service %s/%s/%s/%s, %v",
-					domainProject, key.AppId, key.ServiceName, key.Version, err)
+					key.Tenant, key.AppId, key.ServiceName, key.Version, err)
 			}
 			cache[id] = exist
 		}