From 0ff97264a685fba438b81238f692a4cbb942011f Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Sun, 8 Nov 2015 12:43:15 +0700
Subject: Tighten up the correspondence b/w Close/Dispose

---
 crypto/src/util/zlib/ZInputStream.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'crypto/src/util/zlib/ZInputStream.cs')

diff --git a/crypto/src/util/zlib/ZInputStream.cs b/crypto/src/util/zlib/ZInputStream.cs
index ee19af587..4b7351555 100644
--- a/crypto/src/util/zlib/ZInputStream.cs
+++ b/crypto/src/util/zlib/ZInputStream.cs
@@ -98,22 +98,23 @@ namespace Org.BouncyCastle.Utilities.Zlib
         {
             if (disposing)
             {
-			    if (!closed)
-			    {
-				    closed = true;
-                    Platform.Dispose(input);
-			    }
+			    if (closed)
+                    return;
+
+                closed = true;
+                Platform.Dispose(input);
             }
             base.Dispose(disposing);
         }
 #else
         public override void Close()
 		{
-			if (!closed)
-			{
-				closed = true;
-                Platform.Dispose(input);
-			}
+            if (closed)
+                return;
+
+            closed = true;
+            Platform.Dispose(input);
+            base.Close();
 		}
 #endif
 
-- 
cgit 1.5.1