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 2015/04/04 01:37:26 UTC
svn commit: r1671219 - in /myfaces/shared/trunk/core/src/main:
java/org/apache/myfaces/shared/context/flash/FlashImpl.java
resources/META-INF/myfaces-metadata.xml
Author: lu4242
Date: Fri Apr 3 23:37:25 2015
New Revision: 1671219
URL: http://svn.apache.org/r1671219
Log:
update shared for 2.2.8 release
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java?rev=1671219&r1=1671218&r2=1671219&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java Fri Apr 3 23:37:25 2015
@@ -1063,18 +1063,21 @@ public class FlashImpl extends Flash imp
{
Map<String, Object> map = _getExecuteFlashMap(facesContext);
- //JSF 2.2 invoke PreClearFlashEvent
- facesContext.getApplication().publishEvent(facesContext,
- PreClearFlashEvent.class, map);
-
- // Clear everything - note that because of naming conventions,
- // this will in fact automatically recurse through all children
- // grandchildren etc. - which is kind of a design flaw of SubKeyMap,
- // but one we're relying on
-
- // NOTE that we do not need a null check here, because there will
- // always be an execute Map, however sometimes an empty one!
- map.clear();
+ if (!map.isEmpty())
+ {
+ //JSF 2.2 invoke PreClearFlashEvent
+ facesContext.getApplication().publishEvent(facesContext,
+ PreClearFlashEvent.class, map);
+
+ // Clear everything - note that because of naming conventions,
+ // this will in fact automatically recurse through all children
+ // grandchildren etc. - which is kind of a design flaw of SubKeyMap,
+ // but one we're relying on
+
+ // NOTE that we do not need a null check here, because there will
+ // always be an execute Map, however sometimes an empty one!
+ map.clear();
+ }
}
private void _clearRenderFlashTokenIfMapEmpty(FacesContext facesContext)
Modified: myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml?rev=1671219&r1=1671218&r2=1671219&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml (original)
+++ myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml Fri Apr 3 23:37:25 2015
@@ -8145,6 +8145,7 @@ token is embedded in the data rendered t
<since>1.1</since>
<group>state</group>
<tags>performance</tags>
+ <ignoreUpperLowerCase>true</ignoreUpperLowerCase>
</webConfigParam>
<webConfigParam>
<name>javax.faces.FULL_STATE_SAVING_VIEW_IDS</name>