Removed pointless cache bypass in Swift backend
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 26 Feb 2014 01:40:53 +0000 (17:40 -0800)
committerAaron Schulz <aschulz@wikimedia.org>
Wed, 26 Feb 2014 01:44:24 +0000 (17:44 -0800)
* This was added by mistake in 2af7ad8 apparently

Change-Id: Ic4004428095953ce07e1e97da43748eba04f6639

includes/filebackend/SwiftFileBackend.php

index dea1666..a5c835e 100644 (file)
@@ -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