refactor rest code (#895)

2021-08-10 17:59:33 +08:00
parent 28a7c9d38f
commit 54d57c7d4b
2 changed files with 8 additions and 6 deletions
--- a/core/mapping/unmarshaler.go
+++ b/core/mapping/unmarshaler.go
@@ -322,12 +322,13 @@ func (u *Unmarshaler) processNamedField(field reflect.StructField, value reflect
 	if err != nil {
 		return err
 	}
-	k := key
-	if u.opts.canonicalKey != nil {
-		k = u.opts.canonicalKey(key)
-	}
+
 	fullName = join(fullName, key)
-	mapValue, hasValue := getValue(m, k)
+	canonicalKey := key
+	if u.opts.canonicalKey != nil {
+		canonicalKey = u.opts.canonicalKey(key)
+	}
+	mapValue, hasValue := getValue(m, canonicalKey)
 	if hasValue {
 		return u.processNamedFieldWithValue(field, value, mapValue, key, opts, fullName)
 	}