Support decoding json strings containing null #225

kuafuRace · kuafuRace · commit 59b34adef29c · 2024-03-05T21:03:23.000+08:00
diff --git a/encoding.go b/encoding.go
@@ -33,8 +33,7 @@ func (c *Carbon) UnmarshalJSON(b []byte) error {
 	if c.Error != nil {
 		return c.Error
 	}
-
-	if string(b) == "null" || len(b) == 0 {
+	if len(b) == 0 || string(b) == "null" {
 		return nil
 	}
 	key, value, tz := c.parseTag()

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ func (c *Carbon) UnmarshalJSON(b []byte) error {`
`33`	`33`	`if c.Error != nil {`
`34`	`34`	`return c.Error`
`35`	`35`	`}`
`36`		`-`
`37`		`- if string(b) == "null" \|\| len(b) == 0 {`
	`36`	`+ if len(b) == 0 \|\| string(b) == "null" {`
`38`	`37`	`return nil`
`39`	`38`	`}`
`40`	`39`	`key, value, tz := c.parseTag()`