1 files changed, 18 insertions, 25 deletions
diff --git a/crypto/src/bzip2/CBZip2OutputStream.cs b/crypto/src/bzip2/CBZip2OutputStream.cs
index 38966efd4..5521dce56 100644
--- a/crypto/src/bzip2/CBZip2OutputStream.cs
+++ b/crypto/src/bzip2/CBZip2OutputStream.cs
@@ -421,39 +421,32 @@ namespace Org.BouncyCastle.Bzip2
 
         bool closed = false;
 
-//        protected void Finalize()
-//        {
-//            Close();
-//        }
-
-#if PORTABLE
-        protected override void Dispose(bool disposing)
+        protected void Detach(bool disposing)
         {
             if (disposing)
             {
-                if (closed)
-                    return;
-
-                Finish();
-                closed = true;
-                Platform.Dispose(this.bsStream);
+                if (!closed)
+                {
+                    Finish();
+                    closed = true;
+                }
             }
             base.Dispose(disposing);
         }
-#else
-        public override void Close()
-        {
-            if (closed)
-                return;
-
-            Finish();
-
-            closed = true;
-            Platform.Dispose(this.bsStream);
 
-            base.Close();
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (!closed)
+                {
+                    Finish();
+                    closed = true;
+                    Platform.Dispose(this.bsStream);
+                }
+            }
+            base.Dispose(disposing);
         }
-#endif
 
         public void Finish()
         {