clientv3: always return TimeToLiveResponse in TimeToLive

etcd-io · Feb 10, 2017 · db118ff · db118ff
1 parent 7041116
commit db118ff
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/clientv3/lease.go b/clientv3/lease.go
@@ -195,18 +195,18 @@ func (l *lessor) TimeToLive(ctx context.Context, id LeaseID, opts ...LeaseOption
 	for {
 		r := toLeaseTimeToLiveRequest(id, opts...)
 		resp, err := l.remote.LeaseTimeToLive(ctx, r, grpc.FailFast(false))
+		gresp := &LeaseTimeToLiveResponse{ResponseHeader: resp.GetHeader()}
 		if err == nil {
-			gresp := &LeaseTimeToLiveResponse{
-				ResponseHeader: resp.GetHeader(),
-				ID:             LeaseID(resp.ID),
-				TTL:            resp.TTL,
-				GrantedTTL:     resp.GrantedTTL,
-				Keys:           resp.Keys,
+			gresp = &LeaseTimeToLiveResponse{
+				ID:         LeaseID(resp.ID),
+				TTL:        resp.TTL,
+				GrantedTTL: resp.GrantedTTL,
+				Keys:       resp.Keys,
 			}
 			return gresp, nil
 		}
 		if isHaltErr(ctx, err) {
-			return nil, toErr(ctx, err)
+			return gresp, toErr(ctx, err)
 		}
 	}
 }