MC-39765: No such entity with addressId, occurs randomly on visitors …

…browser. System Log Generated
magento · Dec 16, 2020 · 92ecbbf · 92ecbbf
1 parent 3bb857f
commit 92ecbbf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
@@ -87,7 +87,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             /** @var  \Magento\Customer\Api\Data\CustomerInterface $customer */
             $customer = $this->customerRepository->getById($this->_persistentSession->getSession()->getCustomerId());
             if ($defaultShipping = $customer->getDefaultShipping()) {
-                $address = $this->getCustomerAddressById($defaultShipping);
+                $address = $this->getCustomerAddressById((int) $defaultShipping);
 
                 if ($address !== null) {
                     $this->_customerSession->setDefaultTaxShippingAddress(
@@ -103,7 +103,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
 
             if ($defaultBilling = $customer->getDefaultBilling()) {
-                $address = $this->getCustomerAddressById($defaultBilling);
+                $address = $this->getCustomerAddressById((int) $defaultBilling);
 
                 if ($address !== null) {
                     $this->_customerSession->setDefaultTaxBillingAddress([
@@ -127,7 +127,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface|null
      */
-    private function getCustomerAddressById($addressId)
+    private function getCustomerAddressById(int $addressId)
     {
         try {
             return $this->addressRepository->getById($addressId);