From bcdec738d422de940cdee79fe94d3d407e7341e0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 17 Feb 2015 13:16:59 -0800 Subject: [PATCH] helper/schema: default the new value to zero only for the decode --- helper/schema/schema.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helper/schema/schema.go b/helper/schema/schema.go index d8b4e8166..d781da282 100644 --- a/helper/schema/schema.go +++ b/helper/schema/schema.go @@ -810,13 +810,14 @@ func (m schemaMap) diffString( originalN = n n = schema.StateFunc(n) } - if n == nil { - n = schema.Type.Zero() + nraw := n + if nraw == nil { + nraw = schema.Type.Zero() } if err := mapstructure.WeakDecode(o, &os); err != nil { return fmt.Errorf("%s: %s", k, err) } - if err := mapstructure.WeakDecode(n, &ns); err != nil { + if err := mapstructure.WeakDecode(nraw, &ns); err != nil { return fmt.Errorf("%s: %s", k, err) }