From b692b67edb3ee84705509f08117da9d625540bf6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 5 Feb 2012 03:52:40 +0000 Subject: [PATCH] Removed some useless code and a confusing comment in FSLockManager::doLock(). This was from before referencing counting was used. --- includes/filerepo/backend/lockmanager/FSLockManager.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/filerepo/backend/lockmanager/FSLockManager.php b/includes/filerepo/backend/lockmanager/FSLockManager.php index 33aceb447a..42074fd3fb 100644 --- a/includes/filerepo/backend/lockmanager/FSLockManager.php +++ b/includes/filerepo/backend/lockmanager/FSLockManager.php @@ -43,14 +43,9 @@ class FSLockManager extends LockManager { $lockedPaths = array(); // files locked in this attempt foreach ( $paths as $path ) { - $subStatus = $this->doSingleLock( $path, $type ); - $status->merge( $subStatus ); + $status->merge( $this->doSingleLock( $path, $type ) ); if ( $status->isOK() ) { - // Don't append to $lockedPaths if $path is already locked. - // We do NOT want to unlock the key if we have to rollback. - if ( $subStatus->isGood() ) { // no warnings/fatals? - $lockedPaths[] = $path; - } + $lockedPaths[] = $path; } else { // Abort and unlock everything $status->merge( $this->doUnlock( $lockedPaths, $type ) ); -- 2.20.1