diff options
| author | Russ Cox <rsc@golang.org> | 2015-07-30 14:05:04 +0000 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-07-30 20:00:56 +0000 |
| commit | 80e6d638bf309181eadcb3fecbe99d2d8518e364 (patch) | |
| tree | af5a03077ee8e483c5ebc9a13c7a4310b6bddc71 /src/encoding/json/decode.go | |
| parent | e0c180c44f306997faf7ac4d5d29353fd9518997 (diff) | |
| download | go-80e6d638bf309181eadcb3fecbe99d2d8518e364.tar.xz | |
encoding/json: revert "fix decoding of JSON null values"
Fixes #11912.
Fixes #11937.
This reverts commit 1a99ba55df902a2657d1ccfc52a60024c22dba98.
Change-Id: I32b76053fdabc59f28ca5bedf1b15c0baa8afae1
Reviewed-on: https://go-review.googlesource.com/12893
Reviewed-by: Didier Spezia <didier.06@gmail.com>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Diffstat (limited to 'src/encoding/json/decode.go')
| -rw-r--r-- | src/encoding/json/decode.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go index 4d17c279bd..530e8521dc 100644 --- a/src/encoding/json/decode.go +++ b/src/encoding/json/decode.go @@ -358,7 +358,7 @@ func (d *decodeState) indirect(v reflect.Value, decodingNull bool) (Unmarshaler, if v.IsNil() { v.Set(reflect.New(v.Type().Elem())) } - if v.Type().NumMethod() > 0 && !decodingNull { + if v.Type().NumMethod() > 0 { if u, ok := v.Interface().(Unmarshaler); ok { return u, nil, reflect.Value{} } |