diff options
| author | Jaakko Salo <jaakkos@gmail.com> | 2020-05-24 03:19:04 +0300 |
|---|---|---|
| committer | Jaakko Salo <jaakko@meetiqm.com> | 2020-05-24 20:23:57 +0300 |
| commit | b7dd278e24685fbec34a95b797c204f4a1d53064 (patch) | |
| tree | 4f3402132f6ac15584b82e3e6c99344a592ef877 /lib/private/Lock | |
| parent | 5e35594cb6a8eeb89197ae2ac044bc352bbaba38 (diff) | |
| download | nextcloud-server-b7dd278e24685fbec34a95b797c204f4a1d53064.tar.gz nextcloud-server-b7dd278e24685fbec34a95b797c204f4a1d53064.zip | |
Fix releasing a shared lock multiple times
Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
Diffstat (limited to 'lib/private/Lock')
| -rw-r--r-- | lib/private/Lock/MemcacheLockingProvider.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php index 3d7510f43ff..bff4eabbbd8 100644 --- a/lib/private/Lock/MemcacheLockingProvider.php +++ b/lib/private/Lock/MemcacheLockingProvider.php @@ -94,8 +94,12 @@ class MemcacheLockingProvider extends AbstractLockingProvider { */ public function releaseLock(string $path, int $type) { if ($type === self::LOCK_SHARED) { + $ownSharedLockCount = $this->getOwnSharedLockCount($path); $newValue = 0; - if ($this->getOwnSharedLockCount($path) === 1) { + if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it + return; + } + if ($ownSharedLockCount === 1) { $removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go if (!$removed) { //someone else also has a shared lock, decrease only $newValue = $this->memcache->dec($path); |