MAGETWO-73718: Bundle simple products stays unchanged after scheduled update end

Author: Oleksandr Gorkun

app/code/Magento/Bundle/Model/OptionRepository.php

@@ -201,10 +201,10 @@ public function save(
 
         /** @var \Magento\Bundle\Model\Option $existingOption */
         $existingOption = $optionCollection->getFirstItem();
-        if (!$optionId) {
-            $option->setOptionId(null);
-        }
         if (!$optionId || $existingOption->getParentId() != $parentId) {
+            //If option ID is empty or existing option's parent ID is different
+            //we'd need a new ID for the option.
+            $option->setOptionId(null);
             $option->setDefaultTitle($option->getTitle());
             if (is_array($option->getProductLinks())) {
                 $linksToAdd = $option->getProductLinks();

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

@@ -65,22 +65,22 @@ public function execute($entity, $arguments = [])
         }
 
         if (!$entity->getCopyFromView()) {
-            $updatedOptions = [];
             $oldOptions = $this->optionRepository->getList($entity->getSku());
-
-            $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-
-            $productId = $entity->getData($metadata->getLinkField());
-
-            foreach ($options as $option) {
-                $updatedOptions[$option->getOptionId()][$productId] = (bool)$option->getOptionId();
-            }
-
-            foreach ($oldOptions as $option) {
-                if (!isset($updatedOptions[$option->getOptionId()][$productId])) {
-                    $option->setParentId($productId);
-                    $this->removeOptionLinks($entity->getSku(), $option);
-                    $this->optionRepository->delete($option);
+            if ($oldOptions) {
+                $remainingOptions = [];
+                $metadata
+                    = $this->metadataPool->getMetadata(ProductInterface::class);
+                $productId = $entity->getData($metadata->getLinkField());
+
+                foreach ($options as $option) {
+                    $remainingOptions[] = $option->getOptionId();
+                }
+                foreach ($oldOptions as $option) {
+                    if (!in_array($option->getOptionId(), $remainingOptions)) {
+                        $option->setParentId($productId);
+                        $this->removeOptionLinks($entity->getSku(), $option);
+                        $this->optionRepository->delete($option);
+                    }
                 }
             }
         }