This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5047-new-velocity in repository https://gitbox.apache.org/repos/asf/struts.git
commit d5bc76d772b6ce49d83bd852715d23946a2f44c4 Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Sun Feb 23 11:05:53 2020 +0100 WW-5047 Updates JavaDoc to match with new behaviour --- .../main/java/org/apache/struts2/views/velocity/VelocityManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java index fc2bfb8..9ea9d7a 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java @@ -167,7 +167,7 @@ public class VelocityManager { * @param servletRequest the servlet request object * @param servletResponse the servlet response object * @param extraContext map with extra context - * @return an VelocityContext[] of contexts to chain + * @return a List of contexts to chain or an empty list */ protected List<VelocityContext> prepareChainedContexts(HttpServletRequest servletRequest, HttpServletResponse servletResponse, Map<String, Object> extraContext) { List<VelocityContext> contextList = new ArrayList<>();