Prevented possible problem on getting unexists address

asifabdullah · Mar 10, 2021 · 831a897 · 831a897
1 parent e54e61d
commit 831a897
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Libraries/Nop.Services/Customers/CustomerService.cs b/src/Libraries/Nop.Services/Customers/CustomerService.cs
@@ -1668,7 +1668,7 @@ join cam in _customerAddressMappingRepository.Table on address.Id equals cam.Add
 
             var key = _staticCacheManager.PrepareKeyForShortTermCache(NopCustomerServicesDefaults.CustomerAddressCacheKey, customerId, addressId);
 
-            return await _staticCacheManager.GetAsync(key, async () => await query.SingleAsync());
+            return await _staticCacheManager.GetAsync(key, async () => await query.FirstOrDefaultAsync());
         }
 
         /// <summary>