Merge pull request #14496 from kargakis/deep-copies-fix

deep-copies: Structs cannot be nil
This commit is contained in:
Mike Danese
2015-10-19 10:28:55 -07:00
5 changed files with 12 additions and 14 deletions

View File

@@ -2268,8 +2268,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err
} else if newVal == nil {
out.Amount = nil
} else {
out.Amount = newVal.(*inf.Dec)
}

View File

@@ -34,8 +34,6 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c
if in.Amount != nil {
if newVal, err := c.DeepCopy(in.Amount); err != nil {
return err
} else if newVal == nil {
out.Amount = nil
} else {
out.Amount = newVal.(*inf.Dec)
}