fix #291 omit empty was not handled properly for json raw message

json-iterator · Aug 6, 2018 · 5d789e5 · 5d789e5
1 parent 0260c89
commit 5d789e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/config.go b/config.go
@@ -191,7 +191,7 @@ func (cfg *frozenConfig) validateJsonRawMessage(extension EncoderExtension) {
 			stream.WriteRaw(string(rawMessage))
 		}
 	}, func(ptr unsafe.Pointer) bool {
-		return false
+		return len(*((*json.RawMessage)(ptr))) == 0
 	}}
 	extension[reflect2.TypeOfPtr((*json.RawMessage)(nil)).Elem()] = encoder
 	extension[reflect2.TypeOfPtr((*RawMessage)(nil)).Elem()] = encoder

diff --git a/value_tests/raw_message_test.go b/value_tests/raw_message_test.go
@@ -1,10 +1,18 @@
 package test
 
-import "encoding/json"
+import (
+	"encoding/json"
+)
 
 func init() {
 	marshalCases = append(marshalCases,
 		json.RawMessage("{}"),
+		selectedMarshalCase{struct {
+			Env   string          `json:"env"`
+			Extra json.RawMessage `json:"extra,omitempty"`
+		}{
+			Env: "jfdk",
+		}},
 	)
 	unmarshalCases = append(unmarshalCases, unmarshalCase{
 		ptr:   (*json.RawMessage)(nil),