From c6547ae887799b0939e5e1b925788c794555228e Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 10 May 2021 15:06:15 -0700 Subject: [PATCH] Fix possible panic on race condition --- pkg/resources/cluster/cluster.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/resources/cluster/cluster.go b/pkg/resources/cluster/cluster.go index bf62240..7d5b8ab 100644 --- a/pkg/resources/cluster/cluster.go +++ b/pkg/resources/cluster/cluster.go @@ -175,11 +175,6 @@ func (s *Store) List(apiOp *types.APIRequest, schema *types.APISchema) (types.AP func (s *Store) Watch(apiOp *types.APIRequest, schema *types.APISchema, w types.WatchRequest) (chan types.APIEvent, error) { result := make(chan types.APIEvent, 1) - go func() { - <-apiOp.Context().Done() - close(result) - }() - result <- types.APIEvent{ Name: "local", ResourceType: "management.cattle.io.clusters", @@ -187,5 +182,10 @@ func (s *Store) Watch(apiOp *types.APIRequest, schema *types.APISchema, w types. Object: s.getLocal(), } + go func() { + <-apiOp.Context().Done() + close(result) + }() + return result, nil }