diff --git a/hazelcast/src/main/java/com/hazelcast/map/NearCache.java b/hazelcast/src/main/java/com/hazelcast/map/NearCache.java index 4f99e723423f..05fa61b628bf 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/NearCache.java +++ b/hazelcast/src/main/java/com/hazelcast/map/NearCache.java @@ -35,7 +35,7 @@ public class NearCache { - public static final Object NULL_OBJECT = new Object(); + private static final Object NULL_OBJECT = new Object(); private static final int evictionPercentage = 20; private static final int cleanupInterval = 5000; @@ -163,7 +163,7 @@ public Object get(Data key) { updateSizeEstimator(-calculateCost(record)); return null; } - return record.value; + return record.value.equals(NULL_OBJECT) ? null : record.value; } else { return null; } diff --git a/hazelcast/src/main/java/com/hazelcast/map/proxy/MapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/map/proxy/MapProxySupport.java index f4b636fc58df..fd01705a813c 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/proxy/MapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/map/proxy/MapProxySupport.java @@ -116,9 +116,6 @@ protected Object getInternal(Data key) { if (nearCacheEnabled) { Object cached = mapService.getFromNearCache(name, key); if (cached != null) { - if (cached.equals(NearCache.NULL_OBJECT)) { - return null; - } mapService.interceptAfterGet(name, cached); return cached; }