fixing race condition where we try to remove directories that might n…

…ot be empty. fixes Open-Web-Analytics#301.
jmturner · Mar 17, 2011 · a56b3fd · a56b3fd
1 parent adcf0df
commit a56b3fd
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/modules/base/classes/fileCache.php b/modules/base/classes/fileCache.php
@@ -200,18 +200,16 @@ function flush() {
 
 			$sld = $this->readDir($dir);
 			$this->debug("Reading cache file list from: ". $dir);
-			if (array_key_exists('files', $sld)) {	
-				$this->deleteFiles($sld['files']);
+
+			if ( array_key_exists( 'files', $sld ) ) {	
+				$this->deleteFiles( $sld['files'] );
 			}
-			foreach ($sld['dirs'] as $sk => $sdir) {
-				$ssld = $this->readDir($sdir);
-				$this->debug("Reading cache file list from: ". $sdir);	
-				$this->deleteFiles($ssld['files']);	
-
-				rmdir($sdir);
+
+			foreach ( $sld['dirs'] as $sk => $sdir ) {
+				$ssld = $this->readDir( $sdir );
+				$this->debug( "Reading cache file list from: ". $sdir );	
+				$this->deleteFiles( $ssld['files'] );	
 			}
-
-			rmdir($dir);		
 		}			
 	}