Merge branch '4.1'

Author: BalusC

impl/src/main/java/com/sun/faces/config/InitFacesContext.java

@@ -22,13 +22,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import com.sun.faces.RIConstants;
-import com.sun.faces.config.initfacescontext.NoOpELContext;
-import com.sun.faces.config.initfacescontext.NoOpFacesContext;
-import com.sun.faces.config.initfacescontext.ServletContextAdapter;
-import com.sun.faces.context.ExceptionHandlerImpl;
-import com.sun.faces.util.Util;
-
 import jakarta.el.ELContext;
 import jakarta.faces.FactoryFinder;
 import jakarta.faces.application.Application;
@@ -39,11 +32,18 @@
 import jakarta.faces.context.ExternalContext;
 import jakarta.servlet.ServletContext;
 
+import com.sun.faces.RIConstants;
+import com.sun.faces.config.initfacescontext.NoOpELContext;
+import com.sun.faces.config.initfacescontext.NoOpFacesContext;
+import com.sun.faces.config.initfacescontext.ServletContextAdapter;
+import com.sun.faces.context.ExceptionHandlerImpl;
+import com.sun.faces.util.Util;
+
 /**
  * A special, minimal implementation of FacesContext used at application initialization time. The ExternalContext
  * returned by this FacesContext only exposes the ApplicationMap.
  */
-public class    InitFacesContext extends NoOpFacesContext {
+public class InitFacesContext extends NoOpFacesContext {
 
     private static final String INIT_FACES_CONTEXT_ATTR_NAME = RIConstants.FACES_PREFIX + "InitFacesContext";
 

impl/src/main/java/com/sun/faces/el/CompositeComponentELResolver.java

@@ -16,9 +16,6 @@
 
 package com.sun.faces.el;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-
 import jakarta.el.ELContext;
 import jakarta.el.ELException;
 import jakarta.el.ELResolver;

impl/src/test/java/com/sun/faces/application/WebappLifecycleListenerTestCase.java

@@ -1,19 +1,20 @@
 package com.sun.faces.application;
 
-import com.sun.faces.config.InitFacesContext;
-import com.sun.faces.config.WebConfiguration;
-import com.sun.faces.junit.JUnitFacesTestCaseBase;
-import com.sun.faces.mock.MockHttpServletRequest;
+import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableDistributable;
+
 import jakarta.faces.FacesException;
 import jakarta.faces.FactoryFinder;
 import jakarta.faces.context.FacesContext;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletRequestEvent;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableDistributable;
+import com.sun.faces.config.WebConfiguration;
+import com.sun.faces.junit.JUnitFacesTestCaseBase;
+import com.sun.faces.mock.MockHttpServletRequest;
 
 
 public class WebappLifecycleListenerTestCase extends JUnitFacesTestCaseBase {
@@ -30,11 +31,6 @@ public void tearDown() throws Exception {
             FacesContext.getCurrentInstance().release();
         }
 
-        // This removes the InitFacesContext initialized in lifecycleListener.requestDestroyed(event).
-        if (FacesContext.getCurrentInstance() instanceof InitFacesContext) {
-            ((InitFacesContext) FacesContext.getCurrentInstance()).removeInitContextEntryForCurrentThread();
-        }
-
         // To release ServletContextFacesContextFactory, which also keeps reference to InitFacesContext instance.
         FactoryFinder.releaseFactories();
     }