aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2012-05-25 03:40:56 -0700
committerAaron Schulz <aschulz@wikimedia.org>2012-05-25 03:41:12 -0700
commit6435a6e7371195c2f6ef8d65860ac0cbf2c157e7 (patch)
treefa5e0308b0634aa520bf7b7e37934dc4a3d2c8d3 /includes
parent8759ce093409f7951ca330d437935368861f2ddb (diff)
downloadmediawikicore-6435a6e7371195c2f6ef8d65860ac0cbf2c157e7.tar.gz
mediawikicore-6435a6e7371195c2f6ef8d65860ac0cbf2c157e7.zip
[FileBackend] Purge Swift process cache before container delete for sanity.
* Also tweaked some documentation. Change-Id: I89369d6211de216193ae1d895356137cacded5d7
Diffstat (limited to 'includes')
-rw-r--r--includes/filerepo/backend/SwiftFileBackend.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php
index 36d4334e7f51..d5e0c6794a2c 100644
--- a/includes/filerepo/backend/SwiftFileBackend.php
+++ b/includes/filerepo/backend/SwiftFileBackend.php
@@ -1114,7 +1114,7 @@ class SwiftFileBackend extends FileBackendStore {
*
* @param $container string Container name
* @return CF_Container
- * @throws InvalidResponseException
+ * @throws CloudFilesException
*/
protected function createContainer( $container ) {
$conn = $this->getConnection(); // Swift proxy connection
@@ -1128,12 +1128,12 @@ class SwiftFileBackend extends FileBackendStore {
*
* @param $container string Container name
* @return void
- * @throws InvalidResponseException
+ * @throws CloudFilesException
*/
protected function deleteContainer( $container ) {
$conn = $this->getConnection(); // Swift proxy connection
- $conn->delete_container( $container );
unset( $this->connContainers[$container] ); // purge cache
+ $conn->delete_container( $container );
}
/**