Merge branch 'pr/54'

Change-Id: Ia84202bfb382bfa4717d0b7626c73d9f1e3986ec
mongodb · May 17, 2018 · 29a4d7d · 29a4d7d
2 parents 60a04ea + 8daafec
commit 29a4d7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/bson/encode.go b/bson/encode.go
@@ -488,6 +488,10 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 
 		field := val.Field(i)
 
+		if omitempty && e.isZero(field) {
+			continue
+		}
+
 		switch t := field.Interface().(type) {
 		case *Element:
 			elems = append(elems, t)
@@ -522,10 +526,6 @@ 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:

diff --git a/bson/encode_test.go b/bson/encode_test.go
@@ -750,6 +750,16 @@ func reflectionEncoderTest(t *testing.T) {
 			docToBytes(NewDocument()),
 			nil,
 		},
+		{
+			"omitempty, empty time",
+			struct {
+				A time.Time `bson:",omitempty"`
+			}{
+				A: time.Time{},
+			},
+			docToBytes(NewDocument()),
+			nil,
+		},
 		{
 			"no private fields",
 			struct {