This is an automated email from the ASF dual-hosted git repository.

dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 6ad54a5352ba4f30cd94f4f97b53f51da834109e
Author: Dawid Wysakowicz <[email protected]>
AuthorDate: Tue Feb 9 18:47:30 2021 +0100

    [hotfix] Fix possible null pointer exception in 
RocksStatesPerKeyGroupMergeIterator
---
 .../streaming/state/iterator/RocksStatesPerKeyGroupMergeIterator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/iterator/RocksStatesPerKeyGroupMergeIterator.java
 
b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/iterator/RocksStatesPerKeyGroupMergeIterator.java
index ed8cc0d..2f062e5 100644
--- 
a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/iterator/RocksStatesPerKeyGroupMergeIterator.java
+++ 
b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/iterator/RocksStatesPerKeyGroupMergeIterator.java
@@ -236,6 +236,8 @@ public class RocksStatesPerKeyGroupMergeIterator implements 
KeyValueStateIterato
     public void close() {
         IOUtils.closeQuietly(closeableRegistry);
 
-        heap.clear();
+        if (heap != null) {
+            heap.clear();
+        }
     }
 }

Reply via email to