github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for an error before checking for nil.

Browse Source 
The error object, if it exists, probably has more specific information
to hand to the caller.
This commit is contained in:
Matt Liggett
2016-06-20 17:03:17 -07:00
parent a3f09700e5
commit 3659c6ff32
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
federation/pkg/federation-controller/service/dns.go
View File

@@ -283,12 +283,12 @@ func (s *ServiceController) ensureDnsRecords(clusterName string, cachedService *
serviceName := cachedService.lastState.Name serviceName := cachedService.lastState.Name
namespaceName := cachedService.lastState.Namespace namespaceName := cachedService.lastState.Namespace
zoneNames, regionName, err := s.getClusterZoneNames(clusterName) zoneNames, regionName, err := s.getClusterZoneNames(clusterName)
if zoneNames == nil {
return fmt.Errorf("fail to get cluster zone names")
}
if err != nil { if err != nil {
return err return err
} }
if zoneNames == nil {
return fmt.Errorf("failed to get cluster zone names")
}
dnsZoneName, err := s.getFederationDNSZoneName() dnsZoneName, err := s.getFederationDNSZoneName()
if err != nil { if err != nil {
return err return err