jenkins-bot has submitted this change and it was merged.
Change subject: Fixed silly unlock bug in LocalFile
......................................................................
Fixed silly unlock bug in LocalFile
* Removed the lock instead of just purging some cache data
bug: 54978
Change-Id: Ida007c28e07b0fe1803ab8ed027bc2ec4f55af19
(cherry picked from commit 53b361e52cce69eab706bfec5f579063991fb3b9)
---
M includes/filerepo/file/LocalFile.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 9653db9..627defd 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1772,7 +1772,7 @@
throw new MWException( "Could not acquire lock
for '{$this->getName()}.'" );
}
$dbw->onTransactionIdle( function() use ( $cache, $key
) {
- $cache->delete( $key ); // release on commit
+ $cache->unlock( $key ); // release on commit
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/87587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida007c28e07b0fe1803ab8ed027bc2ec4f55af19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf20
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
