[Pkg-owncloud-commits] [owncloud] 395/457: clear memcache keys in locking

David Prévot taffit at moszumanska.debian.org
Sun Jun 28 20:06:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 520a74187639bbe73bbc4336f349586c8e19e06e
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon Jun 8 15:27:36 2015 +0200

    clear memcache keys in locking
---
 lib/private/lock/memcachelockingprovider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index 3f32ab1..85b62c8 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -91,9 +91,10 @@ class MemcacheLockingProvider implements ILockingProvider {
 			if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
 				$this->memcache->dec($path);
 				$this->acquiredLocks['shared'][$path]--;
+				$this->memcache->cad($path, 0);
 			}
 		} else if ($type === self::LOCK_EXCLUSIVE) {
-			$this->memcache->cas($path, 'exclusive', 0);
+			$this->memcache->cad($path, 'exclusive');
 			unset($this->acquiredLocks['exclusive'][$path]);
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list