Merge pull request #4371 from gyuho/govet_lease

clientv3: fix shadowed variables in lease
This commit is contained in:
Gyu-Ho Lee 2016-02-01 15:17:38 -08:00
commit 24f5640d83

View File

@ -218,7 +218,7 @@ func (l *lessor) recvKeepAliveLoop() {
resp, err := stream.Recv() resp, err := stream.Recv()
if err != nil { if err != nil {
err := l.switchRemoteAndStream(err) err = l.switchRemoteAndStream(err)
if err != nil { if err != nil {
l.Close() l.Close()
return return
@ -278,14 +278,14 @@ func (l *lessor) sendKeepAliveLoop() {
var err error var err error
for _, id := range tosend { for _, id := range tosend {
r := &pb.LeaseKeepAliveRequest{ID: int64(id)} r := &pb.LeaseKeepAliveRequest{ID: int64(id)}
err := stream.Send(r) err = stream.Send(r)
if err != nil { if err != nil {
break break
} }
} }
if err != nil { if err != nil {
err := l.switchRemoteAndStream(err) err = l.switchRemoteAndStream(err)
if err != nil { if err != nil {
l.Close() l.Close()
return return