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 2011/09/26 23:37:33 UTC
svn commit: r1176074 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
Author: lu4242
Date: Mon Sep 26 21:37:33 2011
New Revision: 1176074
URL: http://svn.apache.org/viewvc?rev=1176074&view=rev
Log:
MYFACES-3328 [perf] FlashELResolver should get FacesContext instance when it is necessary
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java?rev=1176074&r1=1176073&r2=1176074&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java Mon Sep 26 21:37:33 2011
@@ -117,13 +117,21 @@ public class FlashELResolver extends ELR
String strProperty = property.toString();
- FacesContext facesContext = facesContext(elContext);
- ExternalContext externalContext = facesContext.getExternalContext();
-
if (base == null)
{
if (FLASH.equals(strProperty))
{
+ FacesContext facesContext = facesContext(elContext);
+ if (facesContext == null)
+ {
+ return null;
+ }
+ ExternalContext externalContext = facesContext.getExternalContext();
+ if (externalContext == null)
+ {
+ return null;
+ }
+
//Access to flash object
elContext.setPropertyResolved(true);
Flash flash = externalContext.getFlash();
@@ -139,6 +147,16 @@ public class FlashELResolver extends ELR
}
else if (base instanceof Flash)
{
+ FacesContext facesContext = facesContext(elContext);
+ if (facesContext == null)
+ {
+ return null;
+ }
+ ExternalContext externalContext = facesContext.getExternalContext();
+ if (externalContext == null)
+ {
+ return null;
+ }
Flash flash = (Flash) base;
if (KEEP.equals(strProperty))
{