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 935754bf91..d75b6f2032 100644 --- a/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java +++ b/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java @@ -42,16 +42,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.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; @@ -74,6 +64,16 @@ 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.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.
@@ -576,10 +576,10 @@ public String encodeResourceURL(String url) {
throw new NullPointerException(getExceptionMessageString(NULL_PARAMETERS_ERROR_MESSAGE_ID, "url"));
}
- String result = ((HttpServletResponse) response).encodeURL(url);
- pushIfPossibleAndNecessary(result);
+ String encodedURL = ((HttpServletResponse) response).encodeURL(url);
+ pushIfPossibleAndNecessary(encodedURL);
- return result;
+ return encodedURL;
}
/**
@@ -1032,26 +1032,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