From 3659c6ff32c2e4df8da9f3714d650e29dd6d1a15 Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Mon, 20 Jun 2016 17:03:17 -0700 Subject: [PATCH] Check for an error before checking for nil. The error object, if it exists, probably has more specific information to hand to the caller. --- federation/pkg/federation-controller/service/dns.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/federation/pkg/federation-controller/service/dns.go b/federation/pkg/federation-controller/service/dns.go index 496acfb8e48..5dd4a0d2964 100644 --- a/federation/pkg/federation-controller/service/dns.go +++ b/federation/pkg/federation-controller/service/dns.go @@ -283,12 +283,12 @@ func (s *ServiceController) ensureDnsRecords(clusterName string, cachedService * serviceName := cachedService.lastState.Name namespaceName := cachedService.lastState.Namespace zoneNames, regionName, err := s.getClusterZoneNames(clusterName) - if zoneNames == nil { - return fmt.Errorf("fail to get cluster zone names") - } if err != nil { return err } + if zoneNames == nil { + return fmt.Errorf("failed to get cluster zone names") + } dnsZoneName, err := s.getFederationDNSZoneName() if err != nil { return err