No change allowed during active persisting

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Internals/EntityChangeRegistry.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2020 Xtensive LLC.
+// Copyright (C) 2008-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
@@ -16,9 +16,9 @@ namespace Xtensive.Orm.Internals
   /// </summary>
   public sealed class EntityChangeRegistry : SessionBound
   {
-    private readonly HashSet<EntityState> @new = new HashSet<EntityState>();
-    private readonly HashSet<EntityState> modified = new HashSet<EntityState>();
-    private readonly HashSet<EntityState> removed = new HashSet<EntityState>();
+    private readonly HashSet<EntityState> @new = new();
+    private readonly HashSet<EntityState> modified = new();
+    private readonly HashSet<EntityState> removed = new();
     private int count;
 
     /// <summary>
@@ -34,7 +34,8 @@ internal void Register(EntityState item)
     {
       // Remove-create sequences fix for Issue 690
       if (item.PersistenceState == PersistenceState.New && removed.Contains(item)) {
-        removed.Remove(item);
+        EnsureChangesAreNotPersisting();
+        _ = removed.Remove(item);
         count--;
         if (item.DifferentialTuple.Difference == null) {
           item.SetPersistenceState(PersistenceState.Synchronized);
@@ -43,18 +44,22 @@ internal void Register(EntityState item)
         item.SetPersistenceState(PersistenceState.Modified);
       }
       else if (item.PersistenceState == PersistenceState.Removed && @new.Contains(item)) {
-        @new.Remove(item);
+        EnsureChangesAreNotPersisting();
+        _ = @new.Remove(item);
         count--;
         return;
       }
       else if (item.PersistenceState == PersistenceState.Removed && modified.Contains(item)) {
-        modified.Remove(item);
+        EnsureChangesAreNotPersisting();
+        _ = modified.Remove(item);
         count--;
       }
 
       var container = GetContainer(item.PersistenceState);
-      if (container.Add(item))
+      EnsureChangesAreNotPersisting();
+      if (container.Add(item)) {
         count++;
+      }
     }
 
     /// <summary>

Orm/Xtensive.Orm/Orm/Internals/EntitySetChangeRegistry.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2014-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2014.03.27
 
@@ -13,35 +13,33 @@ namespace Xtensive.Orm.Internals
   /// </summary>
   public sealed class EntitySetChangeRegistry : SessionBound
   {
-    private readonly HashSet<EntitySetState> modifiedEntitySets = new HashSet<EntitySetState>();
+    private readonly HashSet<EntitySetState> modifiedEntitySets = new();
 
     /// <summary>
     /// Count of registered <see cref="EntitySetState"/>.
     /// </summary>
-    public int Count { get { return modifiedEntitySets.Count; } }
+    public int Count => modifiedEntitySets.Count;
 
     /// <summary>
     /// Register the specified <see cref="EntitySetState"/>.
     /// </summary>
     /// <param name="entitySetState"><see cref="EntitySetState"/> to bound.</param>
     public void Register(EntitySetState entitySetState)
     {
-      modifiedEntitySets.Add(entitySetState);
+      EnsureChangesAreNotPersisting();
+      _ = modifiedEntitySets.Add(entitySetState);
     }
 
     /// <summary>
     /// Gets all registered items.
     /// </summary>
     /// <returns></returns>
-    public IEnumerable<EntitySetState> GetItems()
-    {
-      return modifiedEntitySets;
-    }
+    public IEnumerable<EntitySetState> GetItems() => modifiedEntitySets;
 
-    public void Clear()
-    {
-      modifiedEntitySets.Clear();
-    }
+    /// <summary>
+    /// Clears the registry.
+    /// </summary>
+    public void Clear() => modifiedEntitySets.Clear();
 
     /// <summary>
     /// Initializes a new instance of this class.