From 351a0956df62c66f49b78e32cb9babf1a2278850 Mon Sep 17 00:00:00 2001
From: Ahmet Mircik <ahmetmircik@gmail.com>
Date: Fri, 11 Sep 2020 17:03:32 +0300
Subject: [PATCH] Check map's nullity inside functor

---
 .../hazelcast/query/impl/BaseIndexStore.java  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java b/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java
index fea80096d9f8..7794a4b2d9fe 100644
--- a/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java
+++ b/hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java
@@ -18,6 +18,7 @@
 
 import com.hazelcast.internal.serialization.Data;
 import com.hazelcast.internal.util.Clock;
+import com.hazelcast.internal.util.MapUtil;
 import com.hazelcast.map.impl.record.Record;
 
 import java.util.AbstractSet;
@@ -163,26 +164,24 @@ private class PassThroughFunctor implements CopyFunctor<Data, QueryableEntry> {
 
         @Override
         public Map<Data, QueryableEntry> invoke(Map<Data, QueryableEntry> map) {
-            if (isExpirable()) {
-                return new ExpirationAwareHashMapDelegate(map);
+            if (MapUtil.isNullOrEmpty(map)) {
+                return map;
             }
-            return map;
-        }
 
+            return isExpirable() ? new ExpirationAwareHashMapDelegate(map) : map;
+        }
     }
 
     private class CopyInputFunctor implements CopyFunctor<Data, QueryableEntry> {
 
         @Override
         public Map<Data, QueryableEntry> invoke(Map<Data, QueryableEntry> map) {
-            if (map != null && !map.isEmpty()) {
-                HashMap<Data, QueryableEntry> newMap = new HashMap<>(map);
-                if (isExpirable()) {
-                    return new ExpirationAwareHashMapDelegate(newMap);
-                }
-                return newMap;
+            if (MapUtil.isNullOrEmpty(map)) {
+                return map;
             }
-            return map;
+
+            Map<Data, QueryableEntry> newMap = new HashMap<>(map);
+            return isExpirable() ? new ExpirationAwareHashMapDelegate(newMap) : newMap;
         }
 
     }