You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/01/29 01:14:41 UTC
svn commit: r904316 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
Author: lu4242
Date: Fri Jan 29 00:14:41 2010
New Revision: 904316
URL: http://svn.apache.org/viewvc?rev=904316&view=rev
Log:
MYFACES-2517 Problem with flash and GET (Thanks to Ingo Hofmann and Michael Kurz for provide this fix)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java?rev=904316&r1=904315&r2=904316&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java Fri Jan 29 00:14:41 2010
@@ -322,15 +322,12 @@
String currentToken = _getNextToken();
requestMap.put(FLASH_CURRENT_MAP_KEY, currentToken);
- if (facesContext.isPostback())
+ // Restore token
+ String previousToken = _getPostbackMapKey(facesContext.getExternalContext());
+
+ if (previousToken != null)
{
- //Retore token
- String previousToken = _getPostbackMapKey(facesContext.getExternalContext());
-
- if (previousToken != null)
- {
- requestMap.put(FLASH_POSTBACK_MAP_KEY, previousToken);
- }
+ requestMap.put(FLASH_POSTBACK_MAP_KEY, previousToken);
}
if (isKeepMessages())