github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put nil back into switch

Browse Source
This commit is contained in:
Mikhail Mazurskiy
2018-04-05 20:40:20 +10:00
parent 53e8fd04ec
commit 1fcd199cf7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apimachinery/pkg/runtime/converter.go
View File

@@ -446,9 +446,6 @@ func DeepCopyJSON(x map[string]interface{}) map[string]interface{} {
// DeepCopyJSONValue deep copies the passed value, assuming it is a valid JSON representation i.e. only contains // DeepCopyJSONValue deep copies the passed value, assuming it is a valid JSON representation i.e. only contains
// types produced by json.Unmarshal(). // types produced by json.Unmarshal().
func DeepCopyJSONValue(x interface{}) interface{} { func DeepCopyJSONValue(x interface{}) interface{} {
if x == nil {
return nil
}
switch x := x.(type) { switch x := x.(type) {
case map[string]interface{}: case map[string]interface{}:
if x == nil { if x == nil {
@@ -470,7 +467,7 @@ func DeepCopyJSONValue(x interface{}) interface{} {
clone[i] = DeepCopyJSONValue(v) clone[i] = DeepCopyJSONValue(v)
} }
return clone return clone
case string, int64, bool, float64, encodingjson.Number: case string, int64, bool, float64, nil, encodingjson.Number:
return x return x
default: default:
panic(fmt.Errorf("cannot deep copy %T", x)) panic(fmt.Errorf("cannot deep copy %T", x))