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

clientv3: remove ineffective nil check (#11451)

Browse Source
This commit is contained in:
Ted Yu 2019-12-15 21:38:25 -08:00 committed by Xiang Li
parent 322c38e169
commit fb7703ab43
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientv3/watch.go
View File

@ -23,7 +23,7 @@ import (
v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/mvcc/mvccpb"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@ -402,10 +402,7 @@ func (w *watcher) RequestProgress(ctx context.Context) (err error) {
case reqc <- pr:
return nil
case <-ctx.Done():
if err == nil {
return ctx.Err()
}
return err
return ctx.Err()
case <-donec:
if wgs.closeErr != nil {
return wgs.closeErr