From fb7703ab430ca2f23cd2f70bad8d1d38f9b165fb Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Sun, 15 Dec 2019 21:38:25 -0800 Subject: [PATCH] clientv3: remove ineffective nil check (#11451) --- clientv3/watch.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clientv3/watch.go b/clientv3/watch.go index 87d222d1d..dda60a8c1 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -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