[4.1] Do not double lock assets (joomla#36776)

* Do not double lock assets * db update * Remove double asset lock (#19) * Remove double asset lock * Only remove lock Co-authored-by: Benjamin Trenkle <[email protected]>
brianteeman · Jan 22, 2022 · 6185157 · 6185157
1 parent 3bd24fc
commit 6185157
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
@@ -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)
 		{
@@ -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);