Fixed closing of cache storage

#KTIJ-7680 Fixed
#KT-45843 Fixed

build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt

@@ -47,7 +47,8 @@ abstract class BasicMap<K : Comparable<K>, V>(
         storage.flush(memoryCachesOnly)
     }
 
-    fun close() {
+    // avoid unsynchronized close
+    internal fun close() {
         storage.close()
     }
 

build-common/src/org/jetbrains/kotlin/incremental/storage/CachingLazyStorage.kt

@@ -103,7 +103,11 @@ class CachingLazyStorage<K, V>(
 
     @Synchronized
     override fun close() {
-        storage?.close()
+        try {
+            storage?.close()
+        } finally {
+            storage = null
+        }
     }
 
     private fun createMap(): PersistentHashMap<K, V> = PersistentHashMap(storageFile, keyDescriptor, valueExternalizer)

build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt

@@ -100,7 +100,11 @@ class NonCachingLazyStorage<K, V>(
 
     @Synchronized
     override fun close() {
-        storage?.close()
+        try {
+            storage?.close()
+        } finally {
+            storage = null
+        }
     }
 
     private fun createMap(): PersistentHashMap<K, V> =