From 64b22011dc7694a7d8a099801e107e18cbaf7db7 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Sun, 2 Apr 2023 14:50:22 -0700 Subject: [PATCH] Better use of LoadAndStore based on review feedback Signed-off-by: Derek Collison --- server/stream.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/stream.go b/server/stream.go index 08c9c4de..f9db14d1 100644 --- a/server/stream.go +++ b/server/stream.go @@ -367,16 +367,15 @@ func (a *Account) addStreamWithAssignment(config *StreamConfig, fsConfig *FileSt } // Make sure we are ok when these are done in parallel. - var wg sync.WaitGroup - v, loaded := jsa.inflight.LoadOrStore(cfg.Name, &wg) - ifwg := v.(*sync.WaitGroup) + v, loaded := jsa.inflight.LoadOrStore(cfg.Name, &sync.WaitGroup{}) + wg := v.(*sync.WaitGroup) if loaded { - ifwg.Wait() + wg.Wait() } else { - ifwg.Add(1) + wg.Add(1) defer func() { jsa.inflight.Delete(cfg.Name) - ifwg.Done() + wg.Done() }() }