From fb0994d5c5c24b2553ac8ce8d7bba565f34e2f5a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 20 Sep 2015 23:04:29 -0700 Subject: [PATCH] Prevent IDEA error in doOperationsInternal() Change-Id: I2f0a1885803fff9dc0eb8ca4a595a83736ce421b --- includes/filebackend/FileBackendMultiWrite.php | 1 + includes/filebackend/FileBackendStore.php | 1 + 2 files changed, 2 insertions(+) diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php index 6c6a90b375..47e8dce24c 100644 --- a/includes/filebackend/FileBackendMultiWrite.php +++ b/includes/filebackend/FileBackendMultiWrite.php @@ -152,6 +152,7 @@ class FileBackendMultiWrite extends FileBackend { // Try to lock those files for the scope of this function... if ( empty( $opts['nonLocking'] ) ) { // Try to lock those files for the scope of this function... + /** @noinspection PhpUnusedLocalVariableInspection */ $scopeLock = $this->getScopedLocksForOps( $ops, $status ); if ( !$status->isOK() ) { return $status; // abort diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php index 2562f52d42..94339643d9 100644 --- a/includes/filebackend/FileBackendStore.php +++ b/includes/filebackend/FileBackendStore.php @@ -1076,6 +1076,7 @@ abstract class FileBackendStore extends FileBackend { // Build up a list of files to lock... $paths = $this->getPathsToLockForOpsInternal( $performOps ); // Try to lock those files for the scope of this function... + $scopeLock = $this->getScopedFileLocks( $paths, 'mixed', $status ); if ( !$status->isOK() ) { return $status; // abort -- 2.20.1