MAGETWO-95853: Can't flush Images cache in admin

Author: Oleksandr Iegorov

lib/internal/Magento/Framework/Filesystem/Directory/Write.php

@@ -193,13 +193,13 @@ public function delete($path = null)
             } catch (FileSystemException $e) {
                 $exceptionMessages[] = $e->getMessage();
             }
-        }
-        if (!empty($exceptionMessages)) {
-            throw new FileSystemException(
-                new \Magento\Framework\Phrase(
-                    \implode(' ', $exceptionMessages)
-                )
-            );
+            if (!empty($exceptionMessages)) {
+                throw new FileSystemException(
+                    new \Magento\Framework\Phrase(
+                        \implode(' ', $exceptionMessages)
+                    )
+                );
+            }
         }
         return true;
     }

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -405,14 +405,14 @@ public function deleteDirectory($path)
         $iterator = new \FilesystemIterator($path, $flags);
         /** @var \FilesystemIterator $entity */
         foreach ($iterator as $entity) {
-            if ($entity->isDir()) {
-                try {
+            try {
+                if ($entity->isDir()) {
                     $this->deleteDirectory($entity->getPathname());
-                } catch (FileSystemException $exception) {
-                    $exceptionMessages[] = $exception->getMessage();
+                } else {
+                    $this->deleteFile($entity->getPathname());
                 }
-            } else {
-                $this->deleteFile($entity->getPathname());
+            } catch (FileSystemException $exception) {
+                $exceptionMessages[] = $exception->getMessage();
             }
         }
         if (!empty($exceptionMessages)) {