From 5de3832ca42bcd6d31d75ad0e678d3c67b50b4cd Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer.co.uk>
Date: Tue, 26 Jan 2021 17:34:30 +0000
Subject: [PATCH] https://github.com/OpenHFT/Chronicle-Map/issues/266 added
 extends AbstractCloseable

---
 .../hash/impl/VanillaChronicleHash.java       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
index aa55b94cc..0c7e1f015 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
@@ -22,6 +22,7 @@ import net.openhft.chronicle.bytes.MappedBytesStoreFactory;
 import net.openhft.chronicle.bytes.NativeBytesStore;
 import net.openhft.chronicle.core.Maths;
 import net.openhft.chronicle.core.OS;
+import net.openhft.chronicle.core.io.AbstractCloseable;
 import net.openhft.chronicle.core.io.ReferenceOwner;
 import net.openhft.chronicle.hash.*;
 import net.openhft.chronicle.hash.impl.util.BuildVersion;
@@ -67,9 +68,8 @@ import static net.openhft.chronicle.hash.impl.CompactOffHeapLinearHashTable.*;
 import static net.openhft.chronicle.map.ChronicleHashCorruptionImpl.format;
 import static net.openhft.chronicle.map.ChronicleHashCorruptionImpl.report;
 
-public abstract class VanillaChronicleHash<K,
-        C extends HashEntry<K>, SC extends HashSegmentContext<K, ?>,
-        ECQ extends ExternalHashQueryContext<K>>
+public abstract class VanillaChronicleHash<K, C extends HashEntry<K>, SC extends HashSegmentContext<K, ?>,
+        ECQ extends ExternalHashQueryContext<K>> extends AbstractCloseable
         implements ChronicleHash<K, C, SC, ECQ>, Marshallable {
 
     public static final long TIER_COUNTERS_AREA_SIZE = 64;
@@ -679,13 +679,16 @@ public abstract class VanillaChronicleHash<K,
         return sizeInBytesWithoutTiers + allocatedExtraTierBulks * tierBulkSizeInBytes;
     }
 
+
     @Override
-    public final void close() {
-        if (resources != null && resources.releaseManually()) {
-            cleanupOnClose();
-        }
+    protected void performClose() {
+        if (resources == null || !resources.releaseManually())
+            return;
+
+        cleanupOnClose();
     }
 
+
     protected void cleanupOnClose() {
         // Releases nothing after resources.releaseManually(), only removes the cleaner
         // from the internal linked list of all cleaners.
@@ -698,6 +701,11 @@ public abstract class VanillaChronicleHash<K,
         keyDataAccess = null;
     }
 
+    /**
+     * @return true if has not been closed
+     * @deprecated use !net.openhft.chronicle.core.io.AbstractCloseable#isClosed()
+     */
+    @Deprecated(/*deprecated in x.23*/)
     @Override
     public boolean isOpen() {
         throwExceptionIfClosed();