Merge remote-tracking branch 'origin/2.1-develop' into 2.1-DEVELOP-PR

Author: adifucan

app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php

@@ -29,8 +29,10 @@ protected function processDeletedImages($product, array &$images)
             if (!empty($image['removed'])) {
                 if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
                     $recordsToDelete[] = $image['value_id'];
-                    // only delete physical files if they are not used by any other products
-                    if (!($this->resourceModel->countImageUses($image['file']) > 1)) {
+                    $catalogPath = $this->mediaConfig->getBaseMediaPath();
+                    $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);
+                    // only delete physical files if they are not used by any other products and if this file exists
+                    if (!($this->resourceModel->countImageUses($image['file']) > 1) && $isFile) {
                         $filesToDelete[] = ltrim($image['file'], '/');
                     }
                 }

lib/internal/Magento/Framework/App/Response/Http/FileFactory.php

@@ -99,19 +99,7 @@ public function create(
             if (!empty($content['rm'])) {
                 $dir->delete($file);
             }
-            $this->callExit();
         }
         return $this->_response;
     }
-
-    /**
-     * Call exit
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
-     */
-    protected function callExit()
-    {
-        exit(0);
-    }
 }

lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php

@@ -244,7 +244,7 @@ private function getModelMock()
     {
         $modelMock = $this->getMock(
             'Magento\Framework\App\Response\Http\FileFactory',
-            ['callExit'],
+            null,
             [
                 'response' => $this->responseMock,
                 'filesystem' => $this->fileSystemMock,