From: Aaron <aschulz@wikimedia.org>
Date: Fri, 18 May 2012 00:21:39 +0000 (-0700)
Subject: [FileBackend] Moved closeResources() call up to parent class function.
X-Git-Tag: 1.31.0-rc.0~23578
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=24cad34372bec3005af2eda9208ede387c32de43;p=lhc%2Fweb%2Fwiklou.git

[FileBackend] Moved closeResources() call up to parent class function.

Change-Id: I903b40c17e8f757bc3642e24552ddd518c0ef39d
---

diff --git a/includes/filerepo/backend/FileBackendStore.php b/includes/filerepo/backend/FileBackendStore.php
index 9e0bc8ed5f..7d32beccda 100644
--- a/includes/filerepo/backend/FileBackendStore.php
+++ b/includes/filerepo/backend/FileBackendStore.php
@@ -1016,6 +1016,9 @@ abstract class FileBackendStore extends FileBackend {
 			}
 		}
 		$res = $this->doExecuteOpHandlesInternal( $fileOpHandles );
+		foreach ( $fileOpHandles as $fileOpHandle ) {
+			$fileOpHandle->closeResources();
+		}
 		wfProfileOut( __METHOD__ . '-' . $this->name );
 		wfProfileOut( __METHOD__ );
 		return $res;
diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php
index eefe852cd3..12fc801308 100644
--- a/includes/filerepo/backend/SwiftFileBackend.php
+++ b/includes/filerepo/backend/SwiftFileBackend.php
@@ -973,10 +973,6 @@ class SwiftFileBackend extends FileBackendStore {
 			$statuses[$index] = $status;
 		}
 
-		foreach ( $fileOpHandles as $fileOpHandle ) {
-			$fileOpHandle->closeResources();
-		}
-
 		return $statuses;
 	}