Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #744 from apache/WW-5334-fix-chained-contexts

Browse Source 
WW-5334 Fix empty chained context names in VelocityManager
This commit is contained in:
Lukasz Lenart
2023-09-01 07:40:22 +02:00
committed by GitHub
parent 32e42b3ecd 891598545d
commit 03e232344b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+4 -5
View File
@@ -46,6 +46,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -53,6 +54,7 @@ import java.util.Map;
import java.util.Properties;
import static java.lang.String.format;
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
import static org.apache.struts2.views.util.ContextUtil.OGNL;
@@ -80,7 +82,7 @@ public class VelocityManager {
/**
* Names of contexts that will be chained on every request
*/
private String[] chainedContextNames;
private List<String> chainedContextNames = emptyList();
private Properties velocityProperties;
@@ -165,9 +167,6 @@ public class VelocityManager {
*/
protected List<VelocityContext> prepareChainedContexts(HttpServletRequest servletRequest, HttpServletResponse servletResponse, Map<String, Object> extraContext) {
List<VelocityContext> contextList = new ArrayList<>();
if (chainedContextNames == null) {
return contextList;
}
for (String className : chainedContextNames) {
try {
VelocityContext velocityContext = (VelocityContext) objectFactory.buildBean(className, extraContext);
@@ -340,7 +339,7 @@ public class VelocityManager {
*/
@Inject(StrutsConstants.STRUTS_VELOCITY_CONTEXTS)
public void setChainedContexts(String contexts) {
this.chainedContextNames = contexts.split(",");
this.chainedContextNames = Arrays.stream(contexts.split(",")).filter(StringUtils::isNotBlank).collect(toList());
}
/**