Initial re-migration from original code

2 files changed, 15 insertions, 9 deletions

diff --git a/crypto/bzip2/src/CBZip2InputStream.cs b/crypto/bzip2/src/CBZip2InputStream.cs

index 7efb3b3ab..7411f0a21 100644
--- a/crypto/bzip2/src/CBZip2InputStream.cs
+++ b/crypto/bzip2/src/CBZip2InputStream.cs
@@ -289,7 +289,7 @@ namespace Org.BouncyCastle.Apache.Bzip2
 		private void BsFinishedWithStream() {
             try {
                 if (this.bsStream != null) {
-                    this.bsStream.Close();
+                    this.bsStream.Dispose();
                     this.bsStream = null;
                 }
             } catch {
diff --git a/crypto/bzip2/src/CBZip2OutputStream.cs b/crypto/bzip2/src/CBZip2OutputStream.cs

index bf43a6a6c..690c8a058 100644
--- a/crypto/bzip2/src/CBZip2OutputStream.cs
+++ b/crypto/bzip2/src/CBZip2OutputStream.cs
@@ -384,16 +384,22 @@ namespace Org.BouncyCastle.Apache.Bzip2
 //            Close();
 //        }
 
-        public override void Close() {
-            if (closed) {
-                return;
-            }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (closed)
+                {
+                    return;
+                }
 
-            Finish();
+                Finish();
 
-            closed = true;
-            base.Close();
-            bsStream.Close();
+                closed = true;
+                
+                bsStream.Dispose();
+            }
+            base.Dispose(disposing);
         }
 
         public void Finish() {