MAGETWO-69496: Impossible specify Bundle option title on store view level with changes to more than one store view

Author: Oleksandr Iegorov

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -47,19 +47,19 @@ public function __construct(
      */
     public function execute($entity, $arguments = [])
     {
-        if ($entity->getTypeId() !== Type::TYPE_CODE) {
+        $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions();
+        if ($entity->getTypeId() !== Type::TYPE_CODE || empty($bundleProductOptions)) {
             return $entity;
         }
 
         $existingBundleProductOptions = $this->optionRepository->getList($entity->getSku());
-        $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions();
-
-        if (empty($existingBundleProductOptions) && empty($bundleProductOptions)) {
-            return $entity;
-        }
 
-        $existingOptionsIds = $this->getOptionIds($existingBundleProductOptions);
-        $optionIds = $this->getOptionIds($bundleProductOptions);
+        $existingOptionsIds = !empty($existingBundleProductOptions)
+            ?  $this->getOptionIds($existingBundleProductOptions)
+            : [];
+        $optionIds = !empty($bundleProductOptions)
+            ? $this->getOptionIds($bundleProductOptions)
+            : [];
 
         $options = $bundleProductOptions ?: [];
 
@@ -116,6 +116,11 @@ private function saveOptions($entity, $options)
     private function getOptionIds($options)
     {
         $optionIds = [];
+
+        if (empty($options)) {
+            return $optionIds;
+        }
+
         /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
         foreach ($options as $option) {
             if ($option->getOptionId()) {