Merge pull request #8 from ShawnLaMountain/main

Updating ThunderDesign.Net-PCL.Threading to version 1.0.10
ThunderDesign · Oct 30, 2023 · 894dcea · 894dcea
2 parents d9b4494 + 29d71a5
commit 894dcea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/src/ThunderDesign.Net-PCL.SQLite/Bridges/BaseBridge.cs b/src/ThunderDesign.Net-PCL.SQLite/Bridges/BaseBridge.cs
@@ -27,9 +27,9 @@ public BaseBridge(ISQLiteTable<TValue> bridgeTable) : base()
         #endregion
 
         #region methods
-        public override void Add(TValue value)
+        public new void Add(TValue value)
         {
-            _ReaderWriterLockSlim.EnterWriteLock();
+            _ReaderWriterLockSlim.EnterUpgradeableReadLock();
             try
             {
                 if (!IsKeyAutoIncrement)
@@ -46,13 +46,13 @@ public override void Add(TValue value)
             }
             finally
             {
-                _ReaderWriterLockSlim.ExitWriteLock();
+                _ReaderWriterLockSlim.EnterUpgradeableReadLock();
             }
         }
 
-        public override void Clear()
+        public new void Clear()
         {
-            _ReaderWriterLockSlim.EnterWriteLock();
+            _ReaderWriterLockSlim.EnterUpgradeableReadLock();
             try
             {
                 Task task = BridgeTable.ResetTableAsync();
@@ -65,11 +65,11 @@ public override void Clear()
             }
             finally
             {
-                _ReaderWriterLockSlim.ExitWriteLock();
+                _ReaderWriterLockSlim.ExitUpgradeableReadLock();
             }
         }
 
-        public override bool Remove(TKey key)
+        public new bool Remove(TKey key)
         {
             bool result = false;
 
@@ -78,19 +78,11 @@ public override bool Remove(TKey key)
             {
                 if (this.ContainsKey(key))
                 {
-                    _ReaderWriterLockSlim.EnterWriteLock();
-                    try
-                    {
-                        TValue value = this[key];
-                        Task<int> task = BridgeTable.DeleteRecordAsync(value);
-                        value.PropertyChanged -= OnChildPropertyChanged;
-                        result = base.Remove(key);
-                        task.ConfigureAwait(false).GetAwaiter().GetResult();
-                    }
-                    finally
-                    {
-                        _ReaderWriterLockSlim.ExitWriteLock();
-                    }
+                    TValue value = this[key];
+                    Task<int> task = BridgeTable.DeleteRecordAsync(value);
+                    value.PropertyChanged -= OnChildPropertyChanged;
+                    result = base.Remove(key);
+                    task.ConfigureAwait(false).GetAwaiter().GetResult();
                 }
             }
             finally

diff --git a/src/ThunderDesign.Net-PCL.SQLite/ThunderDesign.Net-PCL.SQLite.csproj b/src/ThunderDesign.Net-PCL.SQLite/ThunderDesign.Net-PCL.SQLite.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-    <PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.6" />
+    <PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.10" />
     <PackageReference Include="ThunderDesign.Net-PCL.ToolBox" Version="1.0.4" />
   </ItemGroup>