From 1e253b484452f04c80387e5b0af8b24ea9e1fed7 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sun, 4 Jan 2026 18:24:46 +0800
Subject: [PATCH] Refactor BasicAggregateRoot to use nullable collections for
 distributed and local events

---
 .../Abp/Domain/Entities/BasicAggregateRoot.cs | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/BasicAggregateRoot.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/BasicAggregateRoot.cs
index e028b55844..826233d5a3 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/BasicAggregateRoot.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/BasicAggregateRoot.cs
@@ -10,36 +10,48 @@ public abstract class BasicAggregateRoot : Entity,
     IAggregateRoot,
     IGeneratesDomainEvents
 {
-    private readonly ICollection<DomainEventRecord> _distributedEvents = new Collection<DomainEventRecord>();
-    private readonly ICollection<DomainEventRecord> _localEvents = new Collection<DomainEventRecord>();
+    private ICollection<DomainEventRecord>? _distributedEvents;
+    private ICollection<DomainEventRecord>? _localEvents;
 
     public virtual IEnumerable<DomainEventRecord> GetLocalEvents()
     {
-        return _localEvents;
+        return _localEvents ?? Array.Empty<DomainEventRecord>();
     }
 
     public virtual IEnumerable<DomainEventRecord> GetDistributedEvents()
     {
-        return _distributedEvents;
+        return _distributedEvents ?? Array.Empty<DomainEventRecord>();
     }
 
     public virtual void ClearLocalEvents()
     {
+        if (_localEvents == null)
+        {
+            return;
+        }
+
         _localEvents.Clear();
     }
 
     public virtual void ClearDistributedEvents()
     {
+        if (_distributedEvents == null)
+        {
+            return;
+        }
+
         _distributedEvents.Clear();
     }
 
     protected virtual void AddLocalEvent(object eventData)
     {
+        _localEvents ??= new Collection<DomainEventRecord>();
         _localEvents.Add(new DomainEventRecord(eventData, EventOrderGenerator.GetNext()));
     }
 
     protected virtual void AddDistributedEvent(object eventData)
     {
+        _distributedEvents ??= new Collection<DomainEventRecord>();
         _distributedEvents.Add(new DomainEventRecord(eventData, EventOrderGenerator.GetNext()));
     }
 }
@@ -49,8 +61,8 @@ public abstract class BasicAggregateRoot<TKey> : Entity<TKey>,
     IAggregateRoot<TKey>,
     IGeneratesDomainEvents
 {
-    private readonly ICollection<DomainEventRecord> _distributedEvents = new Collection<DomainEventRecord>();
-    private readonly ICollection<DomainEventRecord> _localEvents = new Collection<DomainEventRecord>();
+    private ICollection<DomainEventRecord>? _distributedEvents;
+    private ICollection<DomainEventRecord>? _localEvents;
 
     protected BasicAggregateRoot()
     {
@@ -65,31 +77,43 @@ public abstract class BasicAggregateRoot<TKey> : Entity<TKey>,
 
     public virtual IEnumerable<DomainEventRecord> GetLocalEvents()
     {
-        return _localEvents;
+        return _localEvents ?? Array.Empty<DomainEventRecord>();
     }
 
     public virtual IEnumerable<DomainEventRecord> GetDistributedEvents()
     {
-        return _distributedEvents;
+        return _distributedEvents ?? Array.Empty<DomainEventRecord>();
     }
 
     public virtual void ClearLocalEvents()
     {
+        if (_localEvents == null)
+        {
+            return;
+        }
+
         _localEvents.Clear();
     }
 
     public virtual void ClearDistributedEvents()
     {
+        if (_distributedEvents == null)
+        {
+            return;
+        }
+
         _distributedEvents.Clear();
     }
 
     protected virtual void AddLocalEvent(object eventData)
     {
+        _localEvents ??= new Collection<DomainEventRecord>();
         _localEvents.Add(new DomainEventRecord(eventData, EventOrderGenerator.GetNext()));
     }
 
     protected virtual void AddDistributedEvent(object eventData)
     {
+        _distributedEvents ??= new Collection<DomainEventRecord>();
         _distributedEvents.Add(new DomainEventRecord(eventData, EventOrderGenerator.GetNext()));
     }
 }