Skip to content

Commit

Permalink
PR FIXUP - Move close of closing chan to within lock
Browse files Browse the repository at this point in the history
Also removed the Do as it becomes pointless on this side of the lock.
  • Loading branch information
AndrewSisley committed Mar 31, 2023
1 parent a5abd9d commit 114cc2f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions datastore/memory/memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,14 @@ func (d *Datastore) newBasicBatch() ds.Batch {
}

func (d *Datastore) Close() error {
d.closeOnce.Do(func() {
close(d.closing)
})
d.closeLk.Lock()
defer d.closeLk.Unlock()
if d.closed {
return ErrClosed
}

d.closed = true
close(d.closing)
close(d.commit)
return nil
}
Expand Down

0 comments on commit 114cc2f

Please sign in to comment.