Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5465 Short-circuits attributes processing if not found in ValueStack

Browse Source
This commit is contained in:
Lukasz Lenart
2024-10-13 10:40:33 +02:00
parent 00f979e9c2
commit b17d7f6ff9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+10 -1
View File
@@ -26,6 +26,8 @@ import freemarker.template.TemplateModelException;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.Serial;
import java.util.HashMap;
@@ -48,9 +50,13 @@ import java.util.Map;
*/
public class ScopesHashModel extends SimpleHash implements TemplateModel {
private static final Logger LOG = LogManager.getLogger(ScopesHashModel.class);
@Serial
private static final long serialVersionUID = 5551686380141886764L;
private static final String TAG_ATTRIBUTES = "attributes";
private final HttpServletRequest request;
private final ServletContext servletContext;
private ValueStack stack;
@@ -96,6 +102,9 @@ public class ScopesHashModel extends SimpleHash implements TemplateModel {
if (obj != null) {
return wrap(obj);
} else if (TAG_ATTRIBUTES.equals(key)) {
LOG.warn("[{}] cannot be resolved against stack, short-circuiting!", key);
return null;
}
// ok, then try the context
@@ -145,7 +154,7 @@ public class ScopesHashModel extends SimpleHash implements TemplateModel {
}
private Object findValueOnStack(final String key) {
if ("parameters".equals(key)) {
if (TAG_ATTRIBUTES.equals(key)) {
if (parametersCache != null) {
return parametersCache;
}