Unification lock method in cache handlers

joomla · Feb 23, 2017 · 635fd22 · 635fd22
1 parent cd8ae42
commit 635fd22
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php
@@ -253,11 +253,9 @@ public static function isSupported()
 	 */
 	public function lock($id, $group, $locktime)
 	{
-		$returning             = new stdClass;
-		$returning->locklooped = false;
+		$returning = (object) array('locklooped' => false);
 
 		$looptime = $locktime * 10;
-
 		$cache_id = $this->_getCacheId($id, $group) . '_lock';
 
 		$data_lock = apc_add($cache_id, 1, $locktime);
@@ -271,15 +269,15 @@ public function lock($id, $group, $locktime)
 			{
 				if ($lock_counter > $looptime)
 				{
-					$returning->locked     = false;
-					$returning->locklooped = true;
 					break;
 				}
 
 				usleep(100);
 				$data_lock = apc_add($cache_id, 1, $locktime);
 				$lock_counter++;
 			}
+
+			$returning->locklooped = true;
 		}
 
 		$returning->locked = $data_lock;

diff --git a/libraries/joomla/cache/storage/apcu.php b/libraries/joomla/cache/storage/apcu.php
@@ -263,11 +263,9 @@ public static function isSupported()
 	 */
 	public function lock($id, $group, $locktime)
 	{
-		$returning = new stdClass;
-		$returning->locklooped = false;
+		$returning = (object) array('locklooped' => false);
 
 		$looptime = $locktime * 10;
-
 		$cache_id = $this->_getCacheId($id, $group) . '_lock';
 
 		$data_lock = apcu_add($cache_id, 1, $locktime);
@@ -282,15 +280,15 @@ public function lock($id, $group, $locktime)
 			{
 				if ($lock_counter > $looptime)
 				{
-					$returning->locked = false;
-					$returning->locklooped = true;
 					break;
 				}
 
 				usleep(100);
 				$data_lock = apcu_add($cache_id, 1, $locktime);
 				$lock_counter++;
 			}
+
+			$returning->locklooped = true;
 		}
 
 		$returning->locked = $data_lock;

diff --git a/libraries/joomla/cache/storage/file.php b/libraries/joomla/cache/storage/file.php
@@ -320,8 +320,7 @@ public static function isSupported()
 	 */
 	public function lock($id, $group, $locktime)
 	{
-		$returning             = new stdClass;
-		$returning->locklooped = false;
+		$returning = (object) array('locklooped' => false);
 
 		$looptime  = $locktime * 10;
 		$path      = $this->_getFilePath($id, $group);

diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php
@@ -361,11 +361,9 @@ public static function isSupported()
 	 */
 	public function lock($id, $group, $locktime)
 	{
-		$returning = new stdClass;
-		$returning->locklooped = false;
+		$returning = (object) array('locklooped' => false);
 
 		$looptime = $locktime * 10;
-
 		$cache_id = $this->_getCacheId($id, $group);
 
 		$data_lock = static::$_db->add($cache_id . '_lock', 1, 0, $locktime);

diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php
@@ -384,11 +384,9 @@ public static function isSupported()
 	 */
 	public function lock($id, $group, $locktime)
 	{
-		$returning = new stdClass;
-		$returning->locklooped = false;
+		$returning = (object) array('locklooped' => false);
 
 		$looptime = $locktime * 10;
-
 		$cache_id = $this->_getCacheId($id, $group);
 
 		$data_lock = static::$_db->add($cache_id . '_lock', 1, $locktime);