From 68da9aa71638b4ae7a91d61b815a00b4e9be09d4 Mon Sep 17 00:00:00 2001
From: Wenbiao Zheng <delweng@gmail.com>
Date: Tue, 24 Jul 2018 08:00:55 +0800
Subject: [PATCH] rpc: clean up check for missing methods/subscriptions on
 handler (#17145)

---
 rpc/server.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/rpc/server.go b/rpc/server.go
index 90ffadd252..214e1d3ed9 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -94,11 +94,12 @@ func (s *Server) RegisterName(name string, rcvr interface{}) error {
 
 	methods, subscriptions := suitableCallbacks(rcvrVal, svc.typ)
 
-	// already a previous service register under given sname, merge methods/subscriptions
+	if len(methods) == 0 && len(subscriptions) == 0 {
+		return fmt.Errorf("Service %T doesn't have any suitable methods/subscriptions to expose", rcvr)
+	}
+
+	// already a previous service register under given name, merge methods/subscriptions
 	if regsvc, present := s.services[name]; present {
-		if len(methods) == 0 && len(subscriptions) == 0 {
-			return fmt.Errorf("Service %T doesn't have any suitable methods/subscriptions to expose", rcvr)
-		}
 		for _, m := range methods {
 			regsvc.callbacks[formatName(m.method.Name)] = m
 		}
@@ -111,10 +112,6 @@ func (s *Server) RegisterName(name string, rcvr interface{}) error {
 	svc.name = name
 	svc.callbacks, svc.subscriptions = methods, subscriptions
 
-	if len(svc.callbacks) == 0 && len(svc.subscriptions) == 0 {
-		return fmt.Errorf("Service %T doesn't have any suitable methods/subscriptions to expose", rcvr)
-	}
-
 	s.services[svc.name] = svc
 	return nil
 }