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 2010/03/24 00:33:56 UTC
svn commit: r926851 -
/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
Author: gpetracek
Date: Tue Mar 23 23:33:55 2010
New Revision: 926851
URL: http://svn.apache.org/viewvc?rev=926851&view=rev
Log:
sync with the trunk version
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java?rev=926851&r1=926850&r2=926851&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java Tue Mar 23 23:33:55 2010
@@ -126,9 +126,10 @@ public class JsfUtils
*/
public static boolean isApplicationInitialized()
{
- return FacesContext.getCurrentInstance().getClass().getName().startsWith("org.apache.myfaces") ||
- FacesContext.getCurrentInstance().getExternalContext().getRequestMap() != null &&
- !FacesContext.getCurrentInstance().getExternalContext().getRequestMap().isEmpty();
+ return FacesContext.getCurrentInstance() != null &&
+ (FacesContext.getCurrentInstance().getClass().getName().startsWith("org.apache.myfaces") ||
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap() != null &&
+ !FacesContext.getCurrentInstance().getExternalContext().getRequestMap().isEmpty());
}
private static FacesInformationStorage getFacesInformationStorage()