Merge pull request playframework#486 from brakhane/lighthouse-1466-patch

[playframework#1466] Remove cookies with maxAge from savedCookies
eboto · May 10, 2012 · 60f4490 · 60f4490
2 parents 5f97b46 + 8a0f1ae
commit 60f4490
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/framework/src/play/test/FunctionalTest.java b/framework/src/play/test/FunctionalTest.java
@@ -293,6 +293,10 @@ public InvocationContext getInvocationContext() {
                 // 0, they discard immediately.
                 if(e.getValue().maxAge == null || e.getValue().maxAge > 0) {
                     savedCookies.put(e.getKey(), e.getValue());
+                } else {
+                    // cookies with maxAge zero still remove a previously existing cookie,
+                    // like PLAY_FLASH.
+                    savedCookies.remove(e.getKey());
                 }
             }
             response.out.flush();