Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

contrib/recipes: fix nil dereferences on error paths

Browse Source
This commit is contained in:
Anthony Romano 2016-03-04 00:34:36 -08:00
parent b0a88ab287
commit 39109b8b53
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/recipes/double_barrier.go
View File

@ -74,6 +74,9 @@ func (b *DoubleBarrier) Enter() error {
// Leave waits for "count" processes to leave the barrier then returns // Leave waits for "count" processes to leave the barrier then returns
func (b *DoubleBarrier) Leave() error { func (b *DoubleBarrier) Leave() error {
resp, err := b.client.Get(b.ctx, b.key+"/waiters", clientv3.WithPrefix()) resp, err := b.client.Get(b.ctx, b.key+"/waiters", clientv3.WithPrefix())
if err != nil {
return err
}
if len(resp.Kvs) == 0 { if len(resp.Kvs) == 0 {
return nil return nil
} }

3
contrib/recipes/stm.go
View File

@ -91,6 +91,9 @@ func (s *STM) commit() (ok bool, rr error) {
puts = append(puts, v3.OpPut(k, v)) puts = append(puts, v3.OpPut(k, v))
} }
txnresp, err := s.client.Txn(context.TODO()).If(cmps...).Then(puts...).Commit() txnresp, err := s.client.Txn(context.TODO()).If(cmps...).Then(puts...).Commit()
if err != nil {
return false, err
}
return txnresp.Succeeded, err return txnresp.Succeeded, err
} }