You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/06/29 23:17:05 UTC
svn commit: r1141252 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java
Author: gpetracek
Date: Wed Jun 29 21:17:05 2011
New Revision: 1141252
URL: http://svn.apache.org/viewvc?rev=1141252&view=rev
Log:
EXTCDI-184 check if faces-context is active
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java?rev=1141252&r1=1141251&r2=1141252&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java Wed Jun 29 21:17:05 2011
@@ -67,18 +67,25 @@ class GroupedConversationContext extends
*/
public boolean isActive()
{
- if(FacesContext.getCurrentInstance().getExternalContext().getSession(false) != null)
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if(facesContext == null)
+ {
+ return false;
+ }
+
+ if(facesContext.getExternalContext().getSession(false) != null)
{
return true;
}
//workaround for mojarra
- if(FacesContext.getCurrentInstance().getExternalContext().getRequest() != null)
+ if(facesContext.getExternalContext().getRequest() != null)
{
if(!Boolean.FALSE.equals(CodiUtils.lookupFromEnvironment("FORCE_SESSION_CREATION", Boolean.class)))
{
//we need a the session for the contexts -> force it
- FacesContext.getCurrentInstance().getExternalContext().getSession(true);
+ facesContext.getExternalContext().getSession(true);
}
return true;
}