LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

Minor tweaks to null.Time UnmarshalJSON

Browse source
This commit is contained in:
Jed Borovik 2015-09-12 18:48:38 -04:00
parent e5f4f566ed
commit 639d4dad0a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
time.go
View file

@ -86,14 +86,11 @@ func (t *Time) UnmarshalJSON(data []byte) error {
ti, tiOK := x["Time"].(string) ti, tiOK := x["Time"].(string)
valid, validOK := x["Valid"].(bool) valid, validOK := x["Valid"].(bool)
if !tiOK || !validOK { if !tiOK || !validOK {
err = fmt.Errorf("json: unmarshalling map[string]interface{} into Go value of type null.Time requires key \"Time\" to be of type string and key \"Valid\" to be of type bool; found %T and %T, respectively", x["Time"], x["Valid"]) return fmt.Errorf("json: unmarshalling JSON object into Go value of type null.Time requires key \"Time\" to be of type string and key \"Valid\" to be of type bool; found %T and %T, respectively", x["Time"], x["Valid"])
break
} }
err = t.Time.UnmarshalJSON([]byte(`"` + ti + `"`)) err = t.Time.UnmarshalJSON([]byte(`"` + ti + `"`))
t.Valid = valid t.Valid = valid
if err == nil && t.Valid == false { return err
return nil // Return here to prevent `Valid` from being set to true based on nil error below.
}
case nil: case nil:
t.Valid = false t.Valid = false
return nil return nil