diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-20 15:22:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 15:22:49 -0700 |
| commit | 58839cefb50e56ae5b157b37e9814ae83ceee70b (patch) | |
| tree | 5de966481678096fc9567f74f96673b34a65127c /vendor/github.com/golang/protobuf/jsonpb | |
| parent | e2f4492eadb5d3c58606b1fdd5774b63a07c236a (diff) | |
| download | chat-58839cefb50e56ae5b157b37e9814ae83ceee70b.tar.gz chat-58839cefb50e56ae5b157b37e9814ae83ceee70b.tar.bz2 chat-58839cefb50e56ae5b157b37e9814ae83ceee70b.zip | |
Upgrading server dependancies (#6984)
Diffstat (limited to 'vendor/github.com/golang/protobuf/jsonpb')
| -rw-r--r-- | vendor/github.com/golang/protobuf/jsonpb/jsonpb.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go index c7a45d6f0..412ba1ce4 100644 --- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go +++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go @@ -753,7 +753,7 @@ func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMe if err != nil { return fmt.Errorf("bad Timestamp: %v", err) } - target.Field(0).SetInt(int64(t.Unix())) + target.Field(0).SetInt(t.Unix()) target.Field(1).SetInt(int64(t.Nanosecond())) return nil case "Struct": |