MC-39765: No such entity with addressId, occurs randomly on visitors browser. System Log Generated

OlgaVasyltsun · OlgaVasyltsun · commit 3bb857f8d60e · 2020-12-16T14:44:52.000+02:00
diff --git a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
@@ -103,7 +103,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
 
             if ($defaultBilling = $customer->getDefaultBilling()) {
-                $address = $this->getCustomerAddressById($defaultShipping);
+                $address = $this->getCustomerAddressById($defaultBilling);
 
                 if ($address !== null) {
                     $this->_customerSession->setDefaultTaxBillingAddress([

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if ($defaultBilling = $customer->getDefaultBilling()) {`
`106`		`- $address = $this->getCustomerAddressById($defaultShipping);`
	`106`	`+ $address = $this->getCustomerAddressById($defaultBilling);`
`107`	`107`
`108`	`108`	`if ($address !== null) {`
`109`	`109`	`$this->_customerSession->setDefaultTaxBillingAddress([`