X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fmemcache%2Fsrc%2FLock%2FMemcacheLockBackend.php;fp=web%2Fmodules%2Fcontrib%2Fmemcache%2Fsrc%2FLock%2FMemcacheLockBackend.php;h=1490acfea8700ff7f40a741196f85909abaf11dd;hp=a2a7130f097394215ac3b09c4031aa41f5cd4a44;hb=059867c3f96750652c80f39e44c442a58c2549ee;hpb=f8fc16ae6b862bef59baaad5d051dd37b7ff11b2

diff --git a/web/modules/contrib/memcache/src/Lock/MemcacheLockBackend.php b/web/modules/contrib/memcache/src/Lock/MemcacheLockBackend.php
index a2a7130f0..1490acfea 100644
--- a/web/modules/contrib/memcache/src/Lock/MemcacheLockBackend.php
+++ b/web/modules/contrib/memcache/src/Lock/MemcacheLockBackend.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\memcache\MemcacheLockBackend.
- */
-
 namespace Drupal\memcache\Lock;
 
 use Drupal\Core\Lock\LockBackendAbstract;
@@ -20,7 +15,7 @@ class MemcacheLockBackend extends LockBackendAbstract {
    *
    * @var array
    */
-  protected $locks = array();
+  protected $locks = [];
 
   /**
    * The bin name for this lock.
@@ -38,6 +33,11 @@ class MemcacheLockBackend extends LockBackendAbstract {
 
   /**
    * Constructs a new MemcacheLockBackend.
+   *
+   * @param string $bin
+   *   The bin name for this lock.
+   * @param \Drupal\memcache\DrupalMemcacheInterface $memcache
+   *   The memcache wrapper object.
    */
   public function __construct($bin, DrupalMemcacheInterface $memcache) {
     $this->bin = $bin;
@@ -57,11 +57,10 @@ class MemcacheLockBackend extends LockBackendAbstract {
     $timeout = (int) max($timeout, 1);
 
     $lock_id = $this->getLockId();
-    $key = $this->getKey($name);
 
     if (isset($this->locks[$name])) {
       // Try to extend the expiration of a lock we already acquired.
-      $success = !$this->lockMayBeAvailable($name) && $this->memcache->set($key, $lock_id, $timeout);
+      $success = !$this->lockMayBeAvailable($name) && $this->memcache->set($name, $lock_id, $timeout);
 
       if (!$success) {
         // The lock was broken.
@@ -72,7 +71,7 @@ class MemcacheLockBackend extends LockBackendAbstract {
     }
     else {
       if ($this->lockMayBeAvailable($name)) {
-        $success = $this->memcache->set($key, $lock_id, $timeout);
+        $success = $this->memcache->add($name, $lock_id, $timeout);
 
         if (!$success) {
           return FALSE;
@@ -93,14 +92,14 @@ class MemcacheLockBackend extends LockBackendAbstract {
    * {@inheritdoc}
    */
   public function lockMayBeAvailable($name) {
-    return !$this->memcache->get($this->getKey($name));
+    return !$this->memcache->get($name);
   }
 
   /**
    * {@inheritdoc}
    */
   public function release($name) {
-    $this->memcache->delete($this->getKey($name));
+    $this->memcache->delete($name);
     // We unset unconditionally since caller assumes lock is released anyway.
     unset($this->locks[$name]);
   }
@@ -114,22 +113,14 @@ class MemcacheLockBackend extends LockBackendAbstract {
     }
 
     foreach ($this->locks as $name => $id) {
-      $key = $this->getKey($name);
-      $value = $this->memcache->get($key);
+      $value = $this->memcache->get($name);
 
       if ($value == $lock_id) {
-        $this->memcache->delete($key);
+        $this->memcache->delete($name);
       }
     }
 
     $this->locks = [];
   }
 
-  /**
-   * Gets a storage key based on the lock name.
-   */
-  protected function getKey($name) {
-    return 'lock:' . $this->bin . ':' . $name;
-  }
-
 }