Merge pull request #727 from mulderbaba/PAYARA-684-The-list-of-Handle…

…Types–defined-by-FacesListener-should-be-set-as-servlet–context-attribute-while-iterating-Initializers enabled initializing FacesInitializer while using useBundledJsf param.
payara · Apr 12, 2016 · 82b95c3 · 82b95c3
2 parents ad24c78 + 5c51632
commit 82b95c3
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
@@ -122,6 +122,8 @@
  * @version $Revision: 1.48 $ $Date: 2007/07/25 00:52:04 $
  */
 
+// Portions Copyright [2016] [C2B2 Consulting Limited and/or its affiliates]
+
 public class StandardContext
     extends ContainerBase
     implements Context, ServletContext
@@ -6047,11 +6049,7 @@ protected void callServletContainerInitializers()
             for (Map.Entry<Class<? extends ServletContainerInitializer>, Set<Class<?>>> e :
                     initializerList.entrySet()) {
                 Class<? extends ServletContainerInitializer> initializer = e.getKey();
-                // See IT 11333
-                if (isUseMyFaces() &&
-                        Globals.FACES_INITIALIZER.equals(initializer.getName())) {
-                    continue;
-                }
+
                 try {
                     if (log.isLoggable(Level.FINE)) {
                         log.log(Level.FINE, "Calling ServletContainerInitializer [" + initializer