Kevin Wan пре 2 година
родитељ
комит
434973c206
2 измењених фајлова са 7 додато и 3 уклоњено
  1. 4 2
      core/mapping/unmarshaler.go
  2. 3 1
      core/mapping/unmarshaler_test.go

+ 4 - 2
core/mapping/unmarshaler.go

@@ -853,10 +853,12 @@ func (u *Unmarshaler) unmarshalWithFullName(m valuerWithParent, v any, fullName
 
 	numFields := baseType.NumField()
 	for i := 0; i < numFields; i++ {
-		if !baseType.Field(i).IsExported() {
+		field := baseType.Field(i)
+		if !field.IsExported() {
 			continue
 		}
-		if err := u.processField(baseType.Field(i), valElem.Field(i), m, fullName); err != nil {
+
+		if err := u.processField(field, valElem.Field(i), m, fullName); err != nil {
 			return err
 		}
 	}

+ 3 - 1
core/mapping/unmarshaler_test.go

@@ -793,7 +793,9 @@ func TestUnmarshalStringMapFromNotSettableValue(t *testing.T) {
 	}
 
 	ast := assert.New(t)
-	ast.Error(UnmarshalKey(m, &v))
+	ast.NoError(UnmarshalKey(m, &v))
+	assert.Empty(t, v.sort)
+	assert.Nil(t, v.psort)
 }
 
 func TestUnmarshalStringMapFromString(t *testing.T) {