Skip to content

[4.1] Do not double lock assets #36776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2022
Merged

[4.1] Do not double lock assets #36776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2d2eea
Do not double lock assets
laoneo Jan 21, 2022
b88c9b5
db update
laoneo Jan 21, 2022
bc5050c
Remove double asset lock (#19)
bembelimen Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 7 additions & 18 deletions libraries/src/Table/Nested.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,13 +547,6 @@ public function delete($pk = null, $children = true)
);
$this->getDispatcher()->dispatch('onBeforeDelete', $event);

// Lock the table for writing.
if (!$this->_lock())
{
// Error message set in lock method.
return false;
}

// If tracking assets, remove the asset first.
if ($this->_trackAssets)
{
Expand All @@ -562,35 +555,31 @@ public function delete($pk = null, $children = true)
/** @var Asset $asset */
$asset = Table::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));

// Lock the table for writing.
if (!$asset->_lock())
{
// Error message set in lock method.
return false;
}

if ($asset->loadByName($name))
{
// Delete the node in assets table.
if (!$asset->delete(null, $children))
{
$this->setError($asset->getError());
$asset->_unlock();

return false;
}

$asset->_unlock();
}
else
{
$this->setError($asset->getError());
$asset->_unlock();

return false;
}
}

// Lock the table for writing.
if (!$this->_lock())
{
// Error message set in lock method.
return false;
}

// Get the node by id.
$node = $this->_getNode($pk);

Expand Down