diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 21:29:31 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 21:29:31 +0200 |
| commit | 2388222e98462fdbbe44f3e091b2b79d80956a9a (patch) | |
| tree | 17078d861c20a3e48b19c750c6864c5f59248386 /vendor/github.com/json-iterator/go/any.go | |
| parent | a1a4a75abee2c381483a218e1660621ee416ef7c (diff) | |
| download | podman-2388222e98462fdbbe44f3e091b2b79d80956a9a.tar.gz podman-2388222e98462fdbbe44f3e091b2b79d80956a9a.tar.bz2 podman-2388222e98462fdbbe44f3e091b2b79d80956a9a.zip | |
update dependencies
Ran a `go get -u` and bumped K8s deps to 1.15.0.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'vendor/github.com/json-iterator/go/any.go')
| -rw-r--r-- | vendor/github.com/json-iterator/go/any.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vendor/github.com/json-iterator/go/any.go b/vendor/github.com/json-iterator/go/any.go index daecfed61..f6b8aeab0 100644 --- a/vendor/github.com/json-iterator/go/any.go +++ b/vendor/github.com/json-iterator/go/any.go @@ -312,6 +312,10 @@ func (codec *directAnyCodec) Decode(ptr unsafe.Pointer, iter *Iterator) { func (codec *directAnyCodec) Encode(ptr unsafe.Pointer, stream *Stream) { any := *(*Any)(ptr) + if any == nil { + stream.WriteNil() + return + } any.WriteTo(stream) } |