Revert "Revert "Merge branch 'master' into sub""

This reverts commit 0bb97709d4.
This commit is contained in:
chrislu
2023-09-18 18:47:34 -07:00
parent 0bb97709d4
commit 27af11f1e8
21 changed files with 290 additions and 199 deletions

View File

@@ -139,7 +139,7 @@ func (lm *LockManager) InsertLock(path string, expiredAtNs int64, token string,
func (lm *LockManager) GetLockOwner(key string) (owner string, err error) {
lm.locks.Range(func(k string, lock *Lock) bool {
if k == key {
if k == key && lock != nil {
owner = lock.Owner
return false
}