From 3c26d388047c00ec4e0f8f4f69d0539983ad78e2 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 10 Mar 2020 09:10:46 +0100 Subject: [PATCH] Revert Clear computable when value is calculated in LockBasedStorageManager Relates to #KT-35256 --- .../jetbrains/kotlin/storage/LockBasedStorageManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java index fb970b6385e..e92c234d8a5 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java @@ -305,10 +305,7 @@ public class LockBasedStorageManager implements StorageManager { private static class LockBasedLazyValue implements NullableLazyValue { private final LockBasedStorageManager storageManager; - /** - * Computable function is null when value has been calculated - */ - private Function0 computable; + private final Function0 computable; @Nullable private volatile Object value = NotValue.NOT_COMPUTED; @@ -362,7 +359,6 @@ public class LockBasedStorageManager implements StorageManager { postCompute(typedValue); value = typedValue; - computable = null; return typedValue; } catch (Throwable throwable) {