Check if lock exists before releasing it. (#31795)

laravel · Mar 6, 2020 · 2460f09 · 2460f09
1 parent fa901c3
commit 2460f09
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Illuminate/Cache/ArrayLock.php b/src/Illuminate/Cache/ArrayLock.php
@@ -67,6 +67,10 @@ protected function exists()
      */
     public function release()
     {
+        if (! $this->exists()) {
+            return false;
+        }
+
         if (! $this->isOwnedByCurrentProcess()) {
             return false;
         }

diff --git a/tests/Cache/CacheArrayStoreTest.php b/tests/Cache/CacheArrayStoreTest.php
@@ -181,4 +181,15 @@ public function testAnotherOwnerCanForceReleaseALock()
 
         $this->assertTrue($wannabeOwner->acquire());
     }
+
+    public function testReleasingLockAfterAlreadyForceReleasedByAnotherOwnerFails()
+    {
+        $store = new ArrayStore;
+        $owner = $store->lock('foo', 10);
+        $wannabeOwner = $store->lock('foo', 10);
+        $owner->acquire();
+        $wannabeOwner->forceRelease();
+
+        $this->assertFalse($wannabeOwner->release());
+    }
 }