From 748c20c9794d997aed3f037567902926295cbaef Mon Sep 17 00:00:00 2001
From: magodo <wztdyl@sina.com>
Date: Sun, 9 Jun 2019 11:55:36 +0800
Subject: [PATCH] use package level func for unmarshal

---
 codec/json/json.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/codec/json/json.go b/codec/json/json.go
index f17eef72..5af47a07 100644
--- a/codec/json/json.go
+++ b/codec/json/json.go
@@ -11,10 +11,9 @@ import (
 )
 
 type Codec struct {
-	Conn        io.ReadWriteCloser
-	Encoder     *json.Encoder
-	Decoder     *json.Decoder
-	Unmarshaler *jsonpb.Unmarshaler
+	Conn    io.ReadWriteCloser
+	Encoder *json.Encoder
+	Decoder *json.Decoder
 }
 
 func (c *Codec) ReadHeader(m *codec.Message, t codec.MessageType) error {
@@ -26,7 +25,7 @@ func (c *Codec) ReadBody(b interface{}) error {
 		return nil
 	}
 	if pb, ok := b.(proto.Message); ok {
-		return c.Unmarshaler.UnmarshalNext(c.Decoder, pb)
+		return jsonpb.UnmarshalNext(c.Decoder, pb)
 	}
 	return c.Decoder.Decode(b)
 }
@@ -48,9 +47,8 @@ func (c *Codec) String() string {
 
 func NewCodec(c io.ReadWriteCloser) codec.Codec {
 	return &Codec{
-		Conn:        c,
-		Decoder:     json.NewDecoder(c),
-		Encoder:     json.NewEncoder(c),
-		Unmarshaler: &jsonpb.Unmarshaler{},
+		Conn:    c,
+		Decoder: json.NewDecoder(c),
+		Encoder: json.NewEncoder(c),
 	}
 }