X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FLock%2FAbstractLockDriver.php;h=033d6f356e74ce263f9909877e276db80ddb597a;hb=fb371e10486f535ffcb52569a55e185b5a78c015;hp=bcce26129c935d358ce511bc85e57c9878ee3814;hpb=b07dfbb03f06f72d8776da317361fa5bcad098e2;p=friendica.git

diff --git a/src/Core/Lock/AbstractLockDriver.php b/src/Core/Lock/AbstractLockDriver.php
index bcce26129c..033d6f356e 100644
--- a/src/Core/Lock/AbstractLockDriver.php
+++ b/src/Core/Lock/AbstractLockDriver.php
@@ -1,15 +1,16 @@
 <?php
 
 namespace Friendica\Core\Lock;
+use Friendica\BaseObject;
 
 /**
  * Class AbstractLockDriver
  *
  * @package Friendica\Core\Lock
  *
- * @brief Basic class for Locking with common functions (local acquired locks, releaseAll, ..)
+ * Basic class for Locking with common functions (local acquired locks, releaseAll, ..)
  */
-abstract class AbstractLockDriver implements ILockDriver
+abstract class AbstractLockDriver extends BaseObject implements ILockDriver
 {
 	/**
 	 * @var array The local acquired locks
@@ -17,17 +18,17 @@ abstract class AbstractLockDriver implements ILockDriver
 	protected $acquiredLocks = [];
 
 	/**
-	 * @brief Check if we've locally acquired a lock
+	 * Check if we've locally acquired a lock
 	 *
 	 * @param string key The Name of the lock
 	 * @return bool      Returns true if the lock is set
 	 */
 	protected function hasAcquiredLock($key) {
-		return isset($this->acquireLock[$key]);
+		return isset($this->acquireLock[$key]) && $this->acquiredLocks[$key] === true;
 	}
 
 	/**
-	 * @brief Mark a locally acquired lock
+	 * Mark a locally acquired lock
 	 *
 	 * @param string $key The Name of the lock
 	 */
@@ -36,7 +37,7 @@ abstract class AbstractLockDriver implements ILockDriver
 	}
 
 	/**
-	 * @brief Mark a release of a locally acquired lock
+	 * Mark a release of a locally acquired lock
 	 *
 	 * @param string $key The Name of the lock
 	 */
@@ -45,12 +46,12 @@ abstract class AbstractLockDriver implements ILockDriver
 	}
 
 	/**
-	 * @brief Releases all lock that were set by us
+	 * Releases all lock that were set by us
 	 *
 	 * @return void
 	 */
 	public function releaseAll() {
-		foreach ($this->acquiredLocks as $acquiredLock) {
+		foreach ($this->acquiredLocks as $acquiredLock => $hasLock) {
 			$this->releaseLock($acquiredLock);
 		}
 	}