Prevent IDEA error in doOperationsInternal()
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 21 Sep 2015 06:04:29 +0000 (23:04 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Mon, 21 Sep 2015 06:04:29 +0000 (23:04 -0700)
Change-Id: I2f0a1885803fff9dc0eb8ca4a595a83736ce421b

includes/filebackend/FileBackendMultiWrite.php
includes/filebackend/FileBackendStore.php

index 6c6a90b..47e8dce 100644 (file)
@@ -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
index 2562f52..9433964 100644 (file)
@@ -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