Rework disposal of manage and unmanaged resources

Deltares · Dec 19, 2024 · ded5bbd · ded5bbd
1 parent 544c699
commit ded5bbd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 37 deletions.
diff --git a/libs/UGridNET/dll/src/UGridBase.cs b/libs/UGridNET/dll/src/UGridBase.cs
@@ -51,20 +51,36 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposed)
             {
+                // Free unmanaged memory of IntPtrs belonging to the different entities
+                FreeUnmanagedMemoryInTopologyLists();
+
+                // Close the file
+                Close();
+
                 if (disposing)
                 {
-                    // Free unmanaged memory of IntPtrs belonging to the different entities
-                    FreeUnmanagedMemory();
-
-                    // Close the file
-                    Close();
+                    DisposeAndClearTopologyLists();
                 }
 
                 disposed = true;
             }
         }
 
-        private void FreeUnmanagedMemory()
+        private void DisposeAndClearLists<T>(List<T> list) where T : IDisposable
+        {
+            list.ForEach(item => item.Dispose());
+            list.Clear();
+        }
+
+        private void DisposeAndClearTopologyLists()
+        {
+            DisposeAndClearLists(mesh1DList);
+            DisposeAndClearLists(mesh2DList);
+            DisposeAndClearLists(contactsList);
+            DisposeAndClearLists(network1DList);
+        }
+
+        private void FreeUnmanagedMemoryInTopologyLists()
         {
             mesh1DList.ForEach(item => item.Free());
             mesh2DList.ForEach(item => item.Free());

diff --git a/libs/UGridNET/dll/src/UGridReader.cs b/libs/UGridNET/dll/src/UGridReader.cs
@@ -10,8 +10,6 @@ namespace UGridNET
 
     public sealed class UGridReader : UGridBase
     {
-        private bool disposed = false;
-
         public UGridReader(string path) : base(path, 0)
         {
             try
@@ -30,35 +28,6 @@ public UGridReader(string path) : base(path, 0)
             }
         }
 
-        ~UGridReader()
-        {
-            // Cleanup in case Dispose wasn't called
-            Dispose(false);
-        }
-
-        public new void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-            base.Dispose();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (!disposed)
-            {
-                if (disposing)
-                {
-                    // clean up
-                }
-
-                disposed = true;
-
-                base.Dispose(disposing);
-            }
-        }
-
-
         private void ReadMesh1D()
         {
             int count = 0;