MAGETWO-70537: Added try-catch block in getSwatchAttributeImage #10181

Oleksii Korshenko · web-flow · commit 8ca274824cca · 2017-07-10T13:09:22.000-05:00
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
@@ -109,7 +109,11 @@ public function getSwatchAttributeImage($swatchType, $file)
         $absoluteImagePath = $this->mediaDirectory
             ->getAbsolutePath($this->getSwatchMediaPath() . '/' . $generationPath);
         if (!file_exists($absoluteImagePath)) {
-            $this->generateSwatchVariations($file);
+            try {
+                $this->generateSwatchVariations($file);
+            } catch (\Exception $e) {
+                return '';
+            }
         }
         return $this->getSwatchMediaUrl() . '/' . $generationPath;
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,11 @@ public function getSwatchAttributeImage($swatchType, $file)`
`109`	`109`	`$absoluteImagePath = $this->mediaDirectory`
`110`	`110`	`->getAbsolutePath($this->getSwatchMediaPath() . '/' . $generationPath);`
`111`	`111`	`if (!file_exists($absoluteImagePath)) {`
`112`		`- $this->generateSwatchVariations($file);`
	`112`	`+ try {`
	`113`	`+ $this->generateSwatchVariations($file);`
	`114`	`+ } catch (\Exception $e) {`
	`115`	`+ return '';`
	`116`	`+ }`
`113`	`117`	`}`
`114`	`118`	`return $this->getSwatchMediaUrl() . '/' . $generationPath;`
`115`	`119`	`}`