Fix TM2 shadowing error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/78c4c0ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/78c4c0ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/78c4c0ca Branch: refs/heads/master Commit: 78c4c0ca67512562f3fcd918060096549d9260e5 Parents: 387cbed Author: Robert Butts <robert.o.bu...@gmail.com> Authored: Thu Nov 3 14:17:18 2016 -0600 Committer: Dave Neuman <neu...@apache.org> Committed: Mon Nov 7 12:29:08 2016 -0700 ---------------------------------------------------------------------- .../experimental/traffic_monitor/trafficopsdata/trafficopsdata.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/78c4c0ca/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go ---------------------------------------------------------------------- diff --git a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go index 1659ae1..73b5343 100644 --- a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go +++ b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go @@ -123,7 +123,8 @@ func (d TODataThreadsafe) Fetch(to towrap.ITrafficOpsSession, cdn string) error return fmt.Errorf("Error getting CRconfig from Traffic Ops: %v", err) } var crConfig CRConfig - if err := json.Unmarshal(crConfigBytes, &crConfig); err != nil { + err = json.Unmarshal(crConfigBytes, &crConfig) + if err != nil { return fmt.Errorf("Error unmarshalling CRconfig: %v", err) }