You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2011/03/11 14:01:55 UTC
svn commit: r1080561 - in
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash:
FlashImpl.java FlashScopeDisabledException.java SubKeyMap.java
Author: jakobk
Date: Fri Mar 11 13:01:54 2011
New Revision: 1080561
URL: http://svn.apache.org/viewvc?rev=1080561&view=rev
Log:
MYFACES-3005 Only send Flash cookie if needed (some cleanup)
typo in JSFWebConfigParam version
provide ExternalContext via constructor arg
use "true".equalsIgnoreCase() for init param value
let FlashScopeDisabledException be a FacesException
set svn:eol-style to native
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java (props changed)
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=1080561&r1=1080560&r2=1080561&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 Mar 11 13:01:54 2011
@@ -59,7 +59,7 @@ public class FlashImpl extends Flash
/**
* Defines whether flash scope is disabled.
*/
- @JSFWebConfigParam(defaultValue="false",since="2.05")
+ @JSFWebConfigParam(defaultValue="false",since="2.0.5")
private static final String FLASH_SCOPE_DISABLED_PARAM = "org.apache.myfaces.FLASH_SCOPE_DISABLED";
/**
@@ -149,7 +149,7 @@ public class FlashImpl extends Flash
flash = (Flash) applicationMap.get(FLASH_INSTANCE);
if (flash == null)
{
- flash = new FlashImpl();
+ flash = new FlashImpl(context);
applicationMap.put(FLASH_INSTANCE, flash);
}
}
@@ -190,24 +190,12 @@ public class FlashImpl extends Flash
private final AtomicLong _count;
private boolean _flashScopeDisabled;
- public FlashImpl()
+ public FlashImpl(ExternalContext externalContext)
{
_count = new AtomicLong(_getSeed());
// Read whether flash scope is disabled.
- String value = FacesContext.getCurrentInstance().getExternalContext().getInitParameter(FLASH_SCOPE_DISABLED_PARAM);
- if (value != null)
- {
- try
- {
- _flashScopeDisabled = Boolean.parseBoolean(value);
- }
- catch (Throwable e)
- {
- logger.log(Level.SEVERE, "Error determining the value for " + FLASH_SCOPE_DISABLED_PARAM
- + ", expected true/false, using default value (false): " + e.getMessage(), e);
- }
- }
+ _flashScopeDisabled = "true".equalsIgnoreCase(externalContext.getInitParameter(FLASH_SCOPE_DISABLED_PARAM));
}
// ~ methods from javax.faces.context.Flash -------------------------------
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java?rev=1080561&r1=1080560&r2=1080561&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java Fri Mar 11 13:01:54 2011
@@ -18,11 +18,13 @@
*/
package org.apache.myfaces.shared.context.flash;
+import javax.faces.FacesException;
+
/**
* @author Ganesh Jung (latest modification by $Author: $)
* @version $Revision: $ $Date: $
*/
-public class FlashScopeDisabledException extends RuntimeException
+public class FlashScopeDisabledException extends FacesException
{
/**
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
------------------------------------------------------------------------------
svn:eol-style = native