handle NULL_OBJECT inside NearCache

hazelcast · Dec 16, 2013 · 7ce0d4c · 7ce0d4c
1 parent ca70bbb
commit 7ce0d4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;
             }