Merge branch 'MAGETWO-44274' into 'master3'

nikshostko · nikshostko · commit 1a46d9f97cdf · 2015-10-23T18:05:19.000+03:00
Fix bug: Couldn't retrive a remote preview image file.

See merge request !147
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -131,6 +131,9 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
         $this->curl->setConfig(['header' => false]);
         $this->curl->write('GET', $fileUrl);
         $image = $this->curl->read();
+        if (empty($image)) {
+            throw new \InvalidArgumentException(__('Couldn\'t retrive a remote preview image file. Service is inaccessible.'));
+        }
         $this->fileUtility->saveFile($localFilePath, $image);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,9 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)`
`131`	`131`	`$this->curl->setConfig(['header' => false]);`
`132`	`132`	`$this->curl->write('GET', $fileUrl);`
`133`	`133`	`$image = $this->curl->read();`
	`134`	`+ if (empty($image)) {`
	`135`	`+ throw new \InvalidArgumentException(__('Couldn\'t retrive a remote preview image file. Service is inaccessible.'));`
	`136`	`+ }`
`134`	`137`	`$this->fileUtility->saveFile($localFilePath, $image);`
`135`	`138`	`}`
`136`	`139`