From 96ae9c07e30f972455e7887ba47e2c16c1b599ec Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 25 Feb 2014 17:40:53 -0800 Subject: [PATCH] Removed pointless cache bypass in Swift backend * This was added by mistake in 2af7ad8 apparently Change-Id: Ic4004428095953ce07e1e97da43748eba04f6639 --- includes/filebackend/SwiftFileBackend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php index dea16666db..a5c835e619 100644 --- a/includes/filebackend/SwiftFileBackend.php +++ b/includes/filebackend/SwiftFileBackend.php @@ -744,7 +744,7 @@ class SwiftFileBackend extends FileBackendStore { $prefix = ( $dir == '' ) ? null : "{$dir}/"; $status = $this->objectListing( $fullCont, 'names', 1, null, $prefix ); if ( $status->isOk() ) { - return ( count( $status->value ) ); + return ( count( $status->value ) ) > 0; } return null; // error @@ -1470,7 +1470,7 @@ class SwiftFileBackend extends FileBackendStore { } // (a) Check the container - $cstat = $this->getContainerStat( $srcCont, true ); + $cstat = $this->getContainerStat( $srcCont ); if ( $cstat === false ) { $stats[$path] = false; continue; // ok, nothing to do -- 2.20.1