Merge branch 'master' of https://github.com/grpc/grpc-go

2015-10-02 13:30:47 -07:00
parent a25e0a517e 370ccd907f
commit 9985d70a6d
1 changed files with 5 additions and 2 deletions
--- a/rpc_util.go
+++ b/rpc_util.go
@ -187,8 +187,11 @@ func recv(p *parser, c Codec, m interface{}) error {
 	switch pf {
 	case compressionNone:
 		if err := c.Unmarshal(d, m); err != nil {
-			return Errorf(codes.Internal, "grpc: %v", err)
-		}
+			if rErr, ok := err.(rpcError); ok {
+				return rErr
+			} else {
+				return Errorf(codes.Internal, "grpc: %v", err)
+			}
 	default:
 		return Errorf(codes.Internal, "gprc: compression is not supported yet.")
 	}