fix NPE adding null values to readCache

hashgraph · Jan 12, 2024 · 3f35eac · 3f35eac
1 parent e3bdd08
commit 3f35eac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/state/ReadableKVStateBase.java b/...-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/state/ReadableKVStateBase.java
@@ -68,7 +68,9 @@ public V get(@NonNull K key) {
         Objects.requireNonNull(key);
         if (!hasBeenRead(key)) {
             final var value = readFromDataSource(key);
-            markRead(key, value);
+            if (value != null) {
+                markRead(key, value);
+            }
         }
         return readCache.get(key);
     }
@@ -121,7 +123,7 @@ public void reset() {
      * @param key The key
      * @param value The value
      */
-    protected final void markRead(@NonNull K key, @Nullable V value) {
+    protected final void markRead(@NonNull K key, @NonNull V value) {
         readCache.put(key, value);
     }
 

diff --git a/...-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/state/WritableKVStateBase.java b/...-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/state/WritableKVStateBase.java
@@ -110,7 +110,9 @@ public final V getForModify(@NonNull final K key) {
         // We have not queried this key before, so let's look it up and store that we have
         // read this key. And then return the value.
         final var val = getForModifyFromDataSource(key);
-        markRead(key, val);
+        if(val != null){
+            markRead(key, val);
+        }
         return val;
     }