From 28a8cb70e4f064d9f538059047fb056c707dc2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 1 Nov 2019 13:11:59 +0300 Subject: [PATCH] #2052 Check if GetLocalEvents() and GetDistributedEvents() returns null. --- .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs | 8 ++++---- .../Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 3d4b45d75d..0d45d719fd 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -224,15 +224,15 @@ namespace Volo.Abp.EntityFrameworkCore return; } - var localEvents = generatesDomainEventsEntity.GetLocalEvents().ToArray(); - if (localEvents.Any()) + var localEvents = generatesDomainEventsEntity.GetLocalEvents()?.ToArray(); + if (localEvents != null && localEvents.Any()) { changeReport.DomainEvents.AddRange(localEvents.Select(eventData => new DomainEventEntry(entityAsObj, eventData))); generatesDomainEventsEntity.ClearLocalEvents(); } - var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents().ToArray(); - if (distributedEvents.Any()) + var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents()?.ToArray(); + if (distributedEvents != null && distributedEvents.Any()) { changeReport.DistributedEvents.AddRange(distributedEvents.Select(eventData => new DomainEventEntry(entityAsObj, eventData))); generatesDomainEventsEntity.ClearDistributedEvents(); diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs index deca912bec..057f72bbb5 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs @@ -359,8 +359,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB return; } - var localEvents = generatesDomainEventsEntity.GetLocalEvents().ToArray(); - if (localEvents.Any()) + var localEvents = generatesDomainEventsEntity.GetLocalEvents()?.ToArray(); + if (localEvents != null && localEvents.Any()) { foreach (var localEvent in localEvents) { @@ -370,8 +370,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB generatesDomainEventsEntity.ClearLocalEvents(); } - var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents().ToArray(); - if (distributedEvents.Any()) + var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents()?.ToArray(); + if (distributedEvents != null && distributedEvents.Any()) { foreach (var distributedEvent in distributedEvents) {