[FileBackend] Moved closeResources() call up to parent class function.
authorAaron <aschulz@wikimedia.org>
Fri, 18 May 2012 00:21:39 +0000 (17:21 -0700)
committerAaron <aschulz@wikimedia.org>
Fri, 18 May 2012 00:21:39 +0000 (17:21 -0700)
Change-Id: I903b40c17e8f757bc3642e24552ddd518c0ef39d

includes/filerepo/backend/FileBackendStore.php
includes/filerepo/backend/SwiftFileBackend.php

index 9e0bc8e..7d32bec 100644 (file)
@@ -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;
index eefe852..12fc801 100644 (file)
@@ -973,10 +973,6 @@ class SwiftFileBackend extends FileBackendStore {
                        $statuses[$index] = $status;
                }
 
-               foreach ( $fileOpHandles as $fileOpHandle ) {
-                       $fileOpHandle->closeResources();
-               }
-
                return $statuses;
        }