ing

client/client.go

@@ -110,8 +110,11 @@ func (c *Client) CallTimeout(timeout time.Duration, result interface{}, method s
 
 	select {
 	case <-rs.doneChan:
-		result = rs.result
+		if nil != rs.clientError {
 			return rs.clientError
+		}
+		result = rs.result
+		return nil
 	case <-t.C:
 		rs.cancel()
 		return newError(method, params, fmt.Errorf("%s Timeout", c.logHeader()))
@@ -304,11 +307,14 @@ func (c *Client) handleResponse(resCodec protocol.ClientResponseCodec) {
 		return
 	}
 	rs := _rs.(*requestState)
+	if nil != resCodec.Error() {
 		rs.setError(resCodec.Error())
+	} else {
 		err := resCodec.Result(rs.result)
 		if nil != err {
 			rs.setError(err)
 		}
+	}
 
 	rs.done()
 }