Add a private variable to store lock state

jderusse · jderusse · commit c3bda26f7e7e · 2017-04-03T13:13:30.000+02:00
diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
@@ -31,6 +31,7 @@ final class Lock implements LockInterface, LoggerAwareInterface
     private $store;
     private $key;
     private $ttl;
+    private $dirty = false;
 
     /**
      * @param Key            $key   Resource to lock
@@ -52,7 +53,7 @@ public function __construct(Key $key, StoreInterface $store, $ttl = null)
     public function __destruct()
     {
         try {
-            if ($this->isAcquired()) {
+            if ($this->dirty && $this->isAcquired()) {
                 $this->release();
             }
         } catch (\Throwable $e) {
@@ -72,6 +73,7 @@ public function acquire($blocking = false)
                 $this->store->waitAndSave($this->key);
             }
 
+            $this->dirty = true;
             $this->logger->info('Successfully acquired the "{resource}" lock.', array('resource' => $this->key));
 
             if ($this->ttl) {
@@ -80,6 +82,7 @@ public function acquire($blocking = false)
 
             return true;
         } catch (LockConflictedException $e) {
+            $this->dirty = false;
             $this->logger->warning('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', array('resource' => $this->key));
 
             if ($blocking) {
@@ -104,8 +107,10 @@ public function refresh()
 
         try {
             $this->store->putOffExpiration($this->key, $this->ttl);
+            $this->dirty = true;
             $this->logger->info('Expiration defined for "{resource}" lock for "{ttl}" seconds.', array('resource' => $this->key, 'ttl' => $this->ttl));
         } catch (LockConflictedException $e) {
+            $this->dirty = false;
             $this->logger->warning('Failed to define an expiration for the "{resource}" lock, someone else acquired the lock.', array('resource' => $this->key));
             throw $e;
         } catch (\Exception $e) {
@@ -119,7 +124,7 @@ public function refresh()
      */
     public function isAcquired()
     {
-        return $this->store->exists($this->key);
+        return $this->dirty = $this->store->exists($this->key);
     }
 
     /**
@@ -128,6 +133,7 @@ public function isAcquired()
     public function release()
     {
         $this->store->delete($this->key);
+        $this->dirty = false;
 
         if ($this->store->exists($this->key)) {
             $this->logger->warning('Failed to release the "{resource}" lock.', array('resource' => $this->key));
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -103,7 +103,7 @@ public function testIsAquired()
         $lock = new Lock($key, $store, 10);
 
         $store
-            ->expects($this->atLeast(1))
+            ->expects($this->any())
             ->method('exists')
             ->with($key)
             ->willReturn(true);
@@ -123,7 +123,7 @@ public function testRelease()
             ->with($key);
 
         $store
-            ->expects($this->atLeast(1))
+            ->expects($this->once())
             ->method('exists')
             ->with($key)
             ->willReturn(false);
@@ -145,6 +145,8 @@ public function testReleaseOnDestruction()
             ->expects($this->once())
             ->method('delete')
         ;
+
+        $lock->acquire(false);
         unset($lock);
     }
 
@@ -158,12 +160,12 @@ public function testReleaseThrowsExceptionIfNotWellDeleted()
         $lock = new Lock($key, $store, 10);
 
         $store
-            ->expects($this->atLeast(1))
+            ->expects($this->once())
             ->method('delete')
             ->with($key);
 
         $store
-            ->expects($this->atLeast(1))
+            ->expects($this->once())
             ->method('exists')
             ->with($key)
             ->willReturn(true);
