Merge pull request #6938 from derekwaynecarr/fix_nil_pointer

Fix nil pointer in etcd tools
This commit is contained in:
Clayton Coleman
2015-04-17 13:20:59 -04:00

View File

@@ -160,7 +160,10 @@ func (h *EtcdHelper) ExtractObjToList(key string, listObj runtime.Object) error
}
response, err := h.Client.Get(key, false, false)
if err != nil && !IsEtcdNotFound(err) {
if err != nil {
if IsEtcdNotFound(err) {
return nil
}
return err
}