AVRO-2454: Fix CA1063 - Implement IDisposable correctly

yoyolabsio · Sep 4, 2019 · 61e5624 · 61e5624
1 parent 770acd5
commit 61e5624
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/lang/csharp/Avro.ruleset b/lang/csharp/Avro.ruleset
@@ -22,7 +22,6 @@
     We disabled these rules initially to get the code analyzers installed in the project.
     -->
     <Rule Id="CA1062" Action="Info" />
-    <Rule Id="CA1063" Action="Info" />
     <Rule Id="CA1303" Action="Info" />
     <Rule Id="CA1305" Action="Info" />
     <Rule Id="CA1307" Action="Info" />
@@ -35,7 +34,6 @@
     <Rule Id="CA1721" Action="Info" />
     <Rule Id="CA1724" Action="Info" />
     <Rule Id="CA1801" Action="Info" />
-    <Rule Id="CA1816" Action="Info" />
     <Rule Id="CA1819" Action="Info" />
     <Rule Id="CA1820" Action="Info" />
     <Rule Id="CA1822" Action="Info" />

diff --git a/lang/csharp/src/apache/main/File/DataFileReader.cs b/lang/csharp/src/apache/main/File/DataFileReader.cs
@@ -299,6 +299,18 @@ public void Reset()
 
         /// <inheritdoc/>
         public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases resources associated with this <see cref="DataFileReader{T}"/>.
+        /// </summary>
+        /// <param name="disposing">
+        /// True if called from <see cref="Dispose()"/>; false otherwise.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
         {
             _stream.Close();
         }

diff --git a/lang/csharp/src/apache/main/File/DataFileWriter.cs b/lang/csharp/src/apache/main/File/DataFileWriter.cs
@@ -326,6 +326,18 @@ private byte[] GetByteValue(string value)
 
         /// <inheritdoc/>
         public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases resources associated with this <see cref="DataFileWriter{T}"/>.
+        /// </summary>
+        /// <param name="disposing">
+        /// True if called from <see cref="Dispose()"/>; false otherwise.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
         {
             Close();
         }