rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-20 10:41:04 +00:00
Code Issues Releases Wiki Activity

Don't consider nil values when merging

Browse Source
This commit is contained in:
Darren Shepherd
2018-04-24 00:48:44 -07:00
parent ff84949977
commit 063fbdfa71
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
types/convert/merge/merge.go
View File

@@ -90,13 +90,6 @@ func mergeMetadata(dest map[string]interface{}, src map[string]interface{}) map[
} }
func merge(field string, schema *types.Schema, schemas *types.Schemas, dest, src interface{}) interface{} { func merge(field string, schema *types.Schema, schemas *types.Schemas, dest, src interface{}) interface{} {
if dest == nil {
return src
}
if src == nil {
return dest
}
if isMap(field, schema) { if isMap(field, schema) {
return src return src
} }