From 0d07da1a2b838976d56d890700fb0fa6f7105de4 Mon Sep 17 00:00:00 2001
From: boyce <boyce@atbc.com>
Date: Thu, 12 Nov 2020 17:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96error=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rpc/rpchandler.go | 4 ++--
 rpc/server.go     | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rpc/rpchandler.go b/rpc/rpchandler.go
index d255808..fc0d670 100644
--- a/rpc/rpchandler.go
+++ b/rpc/rpchandler.go
@@ -16,14 +16,14 @@ type FuncRpcServer func() (*Server)
 var NilError = reflect.Zero(reflect.TypeOf((*error)(nil)).Elem())
 
 type RpcError string
-
+var noError RpcError
 func (e RpcError) Error() string {
 	return string(e)
 }
 
 func ConvertError(e error) RpcError{
 	if e == nil {
-		return ""
+		return noError
 	}
 
 	rpcErr := RpcError(e.Error())
diff --git a/rpc/server.go b/rpc/server.go
index 534d005..c9411ae 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -316,9 +316,11 @@ func (server *Server) selfNodeRpcHandlerAsyncGo(client *Client,callerRpcHandler
 				ReleaseRpcRequest(req)
 				return
 			}
-
-			pCall.Err = Err
-
+			if len(Err) == 0 {
+				pCall.Err = nil
+			}else{
+				pCall.Err = Err
+			}
 
 			if Returns!=nil {
 				pCall.Reply = Returns