Fixed issue #2187 - deferred write cached value isn't overridden on c…

…hached NULL_ENTRY
hazelcast · Apr 2, 2014 · 139e410 · 139e410
1 parent 2b3b9b5
commit 139e410
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java b/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java
@@ -519,7 +519,7 @@ public void putValue(final String name, final Object value) {
         public void removeAttribute(final String name) {
             if (deferredWrite) {
                 LocalCacheEntry entry = localCache.get(name);
-                if (entry != null) {
+                if (entry != null && entry != NULL_ENTRY) {
                     entry.value = null;
                     entry.removed = true;
                     // dirty needs to be set as last value for memory visibility reasons!
@@ -539,7 +539,7 @@ public void setAttribute(final String name, final Object value) {
             }
             if (deferredWrite) {
                 LocalCacheEntry entry = localCache.get(name);
-                if (entry == null) {
+                if (entry == null || entry == NULL_ENTRY) {
                     entry = new LocalCacheEntry();
                     localCache.put(name, entry);
                 }

diff --git a/hazelcast-wm/src/test/java/com/hazelcast/wm/test/WebfilterTestCase.java b/hazelcast-wm/src/test/java/com/hazelcast/wm/test/WebfilterTestCase.java
@@ -52,6 +52,23 @@ public WebfilterTestCase(String name, String serverXml1, String serverXml2) {
         this.serverXml2 = serverXml2;
     }
 
+    @Test(timeout = 60000)
+    public void test_github_issue_2187() throws Exception {
+        IMap<String, String> map = hz.getMap("default");
+
+        CookieStore cookieStore = new BasicCookieStore();
+        String value = executeRequest("read", serverPort1, cookieStore);
+        assertEquals("null", value);
+
+        executeRequest("write", serverPort1, cookieStore);
+
+        Set<Entry<String, String>> entrySet = map.entrySet();
+        assertEquals(2, entrySet.size());
+
+        value = executeRequest("read", serverPort1, cookieStore);
+        assertEquals("value", value);
+    }
+
     @Test(timeout = 60000)
     public void testAttributeDistribution() throws Exception {
         IMap<String, Object> map = hz.getMap("default");