Merge remote-tracking branch 'upstream/develop' into develop

cluster/cluster_impl/failover_cluster_invoker.go

@@ -93,7 +93,7 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr
 		}
 	}
 	ip, _ := utils.GetLocalIP()
-	return &protocol.RPCResult{Err: perrors.Errorf("Failed to invoke the method %v in the service %v . Tried %v times of "+
+	return &protocol.RPCResult{Err: perrors.Errorf("Failed to invoke the method %v in the service %v. Tried %v times of "+
 		"the providers %v (%v/%v)from the registry %v on the consumer %v using the dubbo version %v. Last error is %v.",
 		methodName, invoker.GetUrl().Service(), retries, providers, len(providers), len(invokers), invoker.directory.GetUrl(), ip, version.Version, result.Error().Error(),
 	)}

cluster/directory/static_directory.go

@@ -25,8 +25,13 @@ type staticDirectory struct {
 }
 
 func NewStaticDirectory(invokers []protocol.Invoker) *staticDirectory {
+	var url common.URL
+
+	if len(invokers) > 0 {
+		url = invokers[0].GetUrl()
+	}
 	return &staticDirectory{
-		BaseDirectory: NewBaseDirectory(&common.URL{}),
+		BaseDirectory: NewBaseDirectory(&url),
 		invokers:      invokers,
 	}
 }

common/url.go

@@ -248,7 +248,16 @@ func (c URL) Context() context.Context {
 }
 
 func (c URL) Service() string {
-	return strings.TrimPrefix(c.Path, "/")
+	service := strings.TrimPrefix(c.Path, "/")
+	if service != "" {
+		return service
+	} else if c.SubURL != nil {
+		service = strings.TrimPrefix(c.SubURL.Path, "/")
+		if service != "" { //if url.path is "" then return suburl's path, special for registry Url
+			return service
+		}
+	}
+	return ""
 }
 func (c URL) GetParam(s string, d string) string {
 	var r string