Merge pull request #1533 from magento-partners/prs-2.2-20170929

Volodymyr Kublytskyi · web-flow · commit 7ca7002e5f94 · 2017-10-02T13:08:11.000+03:00
[EngCom] Partners Pull Requests
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php
@@ -66,8 +66,11 @@ public function execute($entity, $arguments = [])
             $this->saveConfigurableProductAttributes($entity, $configurableOptions);
         }
 
-        $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();
-        $this->resourceModel->saveProducts($entity, $configurableLinks);
+        $configurableLinks = $extensionAttributes->getConfigurableProductLinks();
+        if ($configurableLinks !== null) {
+            $configurableLinks = (array)$configurableLinks;
+            $this->resourceModel->saveProducts($entity, $configurableLinks);
+        }
 
         return $entity;
     }

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,11 @@ public function execute($entity, $arguments = [])`
`66`	`66`	`$this->saveConfigurableProductAttributes($entity, $configurableOptions);`
`67`	`67`	`}`
`68`	`68`
`69`		`- $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();`
`70`		`- $this->resourceModel->saveProducts($entity, $configurableLinks);`
	`69`	`+ $configurableLinks = $extensionAttributes->getConfigurableProductLinks();`
	`70`	`+ if ($configurableLinks !== null) {`
	`71`	`+ $configurableLinks = (array)$configurableLinks;`
	`72`	`+ $this->resourceModel->saveProducts($entity, $configurableLinks);`
	`73`	`+ }`
`71`	`74`
`72`	`75`	`return $entity;`
`73`	`76`	`}`