makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11495] Use $lock->owns_lock() instead of own property

Browse source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-30 15:50:14 +02:00
parent 714092ab4e
commit 78b0d3e723
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/tree/nestedset.php
View file

@ -55,12 +55,6 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
*/ */
protected $item_basic_data = array('*'); protected $item_basic_data = array('*');
/**
* Does the class currently have a lock on the item table?
* @var bool
*/
protected $lock_acquired = false;
/** /**
* Construct * Construct
* *
@ -114,7 +108,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
*/ */
protected function acquire_lock() protected function acquire_lock()
{ {
if ($this->lock_acquired) if ($this->lock->owns_lock())
{ {
return false; return false;
} }
@ -124,25 +118,17 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE'); throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
} }
$this->lock_acquired = true;
return true; return true;
} }
/** /**
* Releases the lock on the item table * Releases the lock on the item table
* *
* @return bool False, if there was no lock to release, true otherwise * @return null
*/ */
protected function release_lock() protected function release_lock()
{ {
if (!$this->lock_acquired)
{
return false;
}
$this->lock->release(); $this->lock->release();
$this->lock_acquired = false;
return true;
} }
/** /**