diff --git a/impl/src/main/java/com/sun/faces/config/WebConfiguration.java b/impl/src/main/java/com/sun/faces/config/WebConfiguration.java index 28c3aa4c65..4a4a2105ee 100644 --- a/impl/src/main/java/com/sun/faces/config/WebConfiguration.java +++ b/impl/src/main/java/com/sun/faces/config/WebConfiguration.java @@ -758,7 +758,8 @@ public enum WebContextInitParameter { NumberOfViews("com.sun.faces.numberOfViewsInSession", "15"), NumberOfLogicalViews("com.sun.faces.numberOfLogicalViews", "15"), NumberOfActiveViewMaps("com.sun.faces.numberOfActiveViewMaps", "25"), - NumberOfConcurrentFlashUsers("com.sun.faces.numberOfConcerrentFlashUsers", "5000"), + NumberOfConcurrentFlashUsers("com.sun.faces.numberOfConcurrentFlashUsers", "5000"), + NumberOfConcerrentFlashUsers("com.sun.faces.numberOfConcerrentFlashUsers", "5000", true, NumberOfConcurrentFlashUsers), NumberOfFlashesBetweenFlashReapings("com.sun.faces.numberOfFlashesBetweenFlashReapings", "5000"), InjectionProviderClass("com.sun.faces.injectionProvider", ""), SerializationProviderClass("com.sun.faces.serializationProvider", ""), diff --git a/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java b/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java index 227335764a..7e0f50f51a 100644 --- a/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java +++ b/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java @@ -40,17 +40,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.faces.RIConstants; -import com.sun.faces.config.WebConfiguration; -import com.sun.faces.context.flash.ELFlash; -import com.sun.faces.renderkit.html_basic.ScriptRenderer; -import com.sun.faces.renderkit.html_basic.StylesheetRenderer; -import com.sun.faces.util.CollectionsUtils; -import com.sun.faces.util.FacesLogger; -import com.sun.faces.util.MessageUtils; -import com.sun.faces.util.TypedCollections; -import com.sun.faces.util.Util; - import jakarta.faces.FacesException; import jakarta.faces.FactoryFinder; import jakarta.faces.application.ProjectStage; @@ -73,6 +62,17 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.PushBuilder; +import com.sun.faces.RIConstants; +import com.sun.faces.config.WebConfiguration; +import com.sun.faces.context.flash.ELFlash; +import com.sun.faces.renderkit.html_basic.ScriptRenderer; +import com.sun.faces.renderkit.html_basic.StylesheetRenderer; +import com.sun.faces.util.CollectionsUtils; +import com.sun.faces.util.FacesLogger; +import com.sun.faces.util.MessageUtils; +import com.sun.faces.util.TypedCollections; +import com.sun.faces.util.Util; + /** *
* This implementation of {@link ExternalContext} is specific to the servlet implementation.
@@ -554,10 +554,10 @@ public String encodeActionURL(String url) {
public String encodeResourceURL(String url) {
Util.notNull("url", url);
- String result = ((HttpServletResponse) response).encodeURL(url);
- pushIfPossibleAndNecessary(result);
+ String encodedURL = ((HttpServletResponse) response).encodeURL(url);
+ pushIfPossibleAndNecessary(encodedURL);
- return result;
+ return encodedURL;
}
/**
@@ -1022,26 +1022,25 @@ public void release() {
flash = null;
}
- private void pushIfPossibleAndNecessary(String result) {
+ @SuppressWarnings("unchecked")
+ private void pushIfPossibleAndNecessary(String encodedURL) {
FacesContext context = FacesContext.getCurrentInstance();
- // 1. Don't bother trying to push if we've already pushed this URL for this request
- @SuppressWarnings("unchecked")
- Set