MAGETWO-80426: Calling the getCustomAttributes() method on a product instance before it is saved, internal _data property structure is changed and extracted incorrectly before saved

Author: adifucan

lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php

@@ -113,7 +113,12 @@ protected function initializeCustomAttributes()
             $customAttributeCodes = $this->getCustomAttributesCodes();
 
             foreach ($customAttributeCodes as $customAttributeCode) {
-                if (isset($this->_data[$customAttributeCode])) {
+                if (isset($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode])) {
+                    $customAttribute = $this->customAttributeFactory->create()
+                        ->setAttributeCode($customAttributeCode)
+                        ->setValue($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode]->getValue());
+                    $customAttributes[$customAttributeCode] = $customAttribute;
+                } elseif (isset($this->_data[$customAttributeCode])) {
                     $customAttribute = $this->customAttributeFactory->create()
                         ->setAttributeCode($customAttributeCode)
                         ->setValue($this->_data[$customAttributeCode]);