Improve one time only runtime check if MyFaces is in use

Issue: SWF-1705
spring-projects · Jul 31, 2017 · 75c9354 · 75c9354
1 parent f0373aa
commit 75c9354
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfRuntimeInformation.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfRuntimeInformation.java
@@ -17,6 +17,7 @@
 package org.springframework.faces.webflow;
 
 import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextWrapper;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -124,6 +125,9 @@ public static boolean isMyFacesInUse() {
 			if (facesContext == null) {
 				return false;
 			}
+			while (facesContext instanceof FacesContextWrapper) {
+				facesContext = ((FacesContextWrapper) facesContext).getWrapped();
+			}
 			myFacesInUse = facesContext.getClass().getPackage().getName().startsWith("org.apache.myfaces.");
 		}
 		return myFacesInUse;