Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep for a 2.3.11 release #826

Merged
merged 7 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ _MF_SINGLTN(_PFX_CORE + "Impl", _MF_OBJECT, /** @lends myfaces._impl.core.Impl.
var delayTimeout = options.delay || this._RT.getLocalOrGlobalConfig(context, "delay", false);

if (!!delayTimeout) {
if(delayTimeout.toLowerCase && delayTimeout.toLowerCase() === "none"){
delayTimeout = 0;
}
if(!(delayTimeout >= 0)) {
// abbreviation which covers all cases of non positive values,
// including NaN and non-numeric strings, no type equality is deliberate here,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ _MF_SINGLTN(_PFX_XHR+"_AjaxUtils", _MF_OBJECT,
form = this._Dom.byId(form);
var _t = this;
var foundNames = this._Dom.findAll(form, function(node) {
var name = node.getAttribute("name");
var name = null;
if(node.getAttribute && node.getAttribute("name")) {
name = node.getAttribute("name");
}
if(!name || name.indexOf(_t.P_VIEWSTATE)) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ public final void addELContextListener(final ELContextListener listener)
public void publishEvent(FacesContext facesContext, Class<? extends SystemEvent> systemEventClass,
Class<?> sourceBaseType, Object source)
{
checkNull(facesContext, "facesContext");
checkNull(systemEventClass, "systemEventClass");
checkNull(source, "source");

Expand Down Expand Up @@ -647,7 +646,6 @@ public void publishEvent(FacesContext facesContext, Class<? extends SystemEvent>
@Override
public void publishEvent(FacesContext facesContext, Class<? extends SystemEvent> systemEventClass, Object source)
{
checkNull(source, "source");
publishEvent(facesContext, systemEventClass, source.getClass(), source);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import javax.faces.annotation.RequestParameterValuesMap;
import javax.faces.annotation.SessionMap;
import javax.faces.annotation.ViewMap;
import javax.faces.application.Application;
import javax.faces.application.ResourceHandler;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
Expand All @@ -45,9 +46,9 @@ public class JsfArtifactProducer
@Produces
@Named("application")
@ApplicationScoped
public Object getApplication()
public Application getApplication()
{
return FacesContext.getCurrentInstance().getExternalContext().getContext();
return FacesContext.getCurrentInstance().getApplication();
}

@Produces
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,10 +590,6 @@ public void redirect(final String url) throws IOException
PartialViewContext partialViewContext = facesContext.getPartialViewContext();
if (partialViewContext.isPartialRequest())
{
if (_servletResponse instanceof HttpServletResponse && facesContext.getResponseComplete())
{
throw new IllegalStateException();
}
PartialResponseWriter writer = partialViewContext.getPartialResponseWriter();
this.setResponseContentType("text/xml");
this.setResponseCharacterEncoding("UTF-8");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ public void testMyFaces4695() throws Exception

SearchExpressionHandler handler = facesContext.getApplication().getSearchExpressionHandler();

Assertions.assertEquals("form1:one", handler.resolveClientId(searchContext, "form1:one"));
Assert.assertEquals("form1:one", handler.resolveClientId(searchContext, "form1:one"));

processRemainingPhases();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ else if (allowExactMatch && mapping.startsWith("/") && mapping.equals(servletPat
}
if (mapping.equals(servletPath))
{
return FacesServletMapping.createExactMapping(mapping); // MYFACES-4524
return FacesServletMapping.createPrefixMapping(mapping);
}
}
}
Expand Down
Loading