Merge pull request #27736 from mml/fed-check-err-first

Automatic merge from submit-queue Check for an error before checking for nil.

Merge pull request #27736 from mml/fed-check-err-first
64b2c0e2 · k8s-merge-robot · GitHub · 6a7fd056 · 3659c6ff · 64b2c0e2
Commit 64b2c0e2 authored Jun 20, 2016 by k8s-merge-robot Committed by GitHub Jun 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

dns.go federation/pkg/federation-controller/service/dns.go +3 -3

No files found.
--- 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