From 4ce1b8094754c20074519905fc0e022ad60c5bf4 Mon Sep 17 00:00:00 2001
From: lifeiyi <736926938@qq.com>
Date: Wed, 10 Jun 2020 21:03:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DRPC=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=EF=BC=8C=E5=9C=A8=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=E5=A4=84=E6=97=A0=E6=B3=95=E8=8E=B7?=
 =?UTF-8?q?=E5=BE=97err?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/rpc/server.go b/rpc/server.go
index c098840..fe0f435 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -91,12 +91,17 @@ func (agent *RpcAgent) WriteRespone(serviceMethod string,seq uint64,reply interf
 	var mReply []byte
 	var rpcError *RpcError
 	var errM error
-	if reply!=nil {
-		mReply,errM = processor.Marshal(reply)
-		if errM != nil {
-			rpcError = ConvertError(errM)
+	if err != nil {
+		rpcError = err
+	} else {
+		if reply!=nil {
+			mReply,errM = processor.Marshal(reply)
+			if errM != nil {
+				rpcError = ConvertError(errM)
+			}
 		}
 	}
+
 	rpcRespone.RpcResponeData = processor.MakeRpcResponse(seq,rpcError,mReply)
 	bytes,errM :=  processor.Marshal(rpcRespone.RpcResponeData)
 	if errM != nil {