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

Merge pull request #10632 from nikhiljindal/revert-etcderrors

Browse Source 
Revert "Merge pull request #10246 from nikhiljindal"
This commit is contained in:
Zach Loafman
2015-07-01 13:06:18 -07:00
parent 4f9cfc84c4 d82d5d11a7
commit 9db58ff2b2
8 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/registry/generic/etcd/etcd.go
View File

@@ -191,9 +191,7 @@ func (e *Etcd) CreateWithName(ctx api.Context, name string, obj runtime.Object)
return err
}
err = e.Helper.CreateObj(key, obj, nil, ttl)
if err != nil {
err = etcderr.InterpretCreateError(err, e.EndpointName, name)
}
err = etcderr.InterpretCreateError(err, e.EndpointName, name)
if err == nil && e.Decorator != nil {
err = e.Decorator(obj)
}
@@ -252,9 +250,7 @@ func (e *Etcd) UpdateWithName(ctx api.Context, name string, obj runtime.Object)
return err
}
err = e.Helper.SetObj(key, obj, nil, ttl)
if err != nil {
err = etcderr.InterpretUpdateError(err, e.EndpointName, name)
}
err = etcderr.InterpretUpdateError(err, e.EndpointName, name)
if err == nil && e.Decorator != nil {
err = e.Decorator(obj)
}