Author: pete.muir(a)jboss.org
Date: 2008-08-06 13:32:57 -0400 (Wed, 06 Aug 2008)
New Revision: 8612
Modified:
trunk/src/main/org/jboss/seam/faces/FacesExpressions.java
Log:
JBSEAM-2899
Modified: trunk/src/main/org/jboss/seam/faces/FacesExpressions.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesExpressions.java 2008-08-06 16:30:44 UTC (rev
8611)
+++ trunk/src/main/org/jboss/seam/faces/FacesExpressions.java 2008-08-06 17:32:57 UTC (rev
8612)
@@ -11,6 +11,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.contexts.FacesLifecycle;
import org.jboss.seam.core.Expressions;
/**
@@ -33,7 +34,8 @@
public ELContext getELContext()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
- return facesContext==null ? super.getELContext() : facesContext.getELContext();
+ return facesContext == null || FacesLifecycle.getPhaseId() == null
+ ? super.getELContext() : facesContext.getELContext();
}
@Override
Show replies by date