Check for 'omitempty' before inline handling

stitch84 · stitch84 · commit 31abc2935abf · 2018-05-03T21:41:36.000+02:00
diff --git a/bson/encode.go b/bson/encode.go
@@ -516,6 +516,10 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 		}
 		field = e.underlyingVal(field)
 
+		if omitempty && e.isZero(field) {
+			continue
+		}
+		
 		if inline {
 			switch sf.Type.Kind() {
 			case reflect.Map:
@@ -537,9 +541,6 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 			}
 		}
 
-		if omitempty && e.isZero(field) {
-			continue
-		}
 		elem, err := e.elemFromValue(key, field, minsize)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,10 @@ func (e encoder) encodeStruct(val reflect.Value) ([]Element, error) {`
`516`	`516`	`}`
`517`	`517`	`field = e.underlyingVal(field)`
`518`	`518`
	`519`	`+ if omitempty && e.isZero(field) {`
	`520`	`+ continue`
	`521`	`+ }`
	`522`	`+`
`519`	`523`	`if inline {`
`520`	`524`	`switch sf.Type.Kind() {`
`521`	`525`	`case reflect.Map:`
`@@ -537,9 +541,6 @@ func (e encoder) encodeStruct(val reflect.Value) ([]Element, error) {`
`537`	`541`	`}`
`538`	`542`	`}`
`539`	`543`
`540`		`- if omitempty && e.isZero(field) {`
`541`		`- continue`
`542`		`- }`
`543`	`544`	`elem, err := e.elemFromValue(key, field, minsize)`
`544`	`545`	`if err != nil {`
`545`	`546`	`return nil, err`