Author: cbrisson
Date: Thu Jul 13 09:54:52 2017
New Revision: 1801822
URL: http://svn.apache.org/viewvc?rev=1801822&view=rev
Log:
[tools] Fix backward compatibility issue to keep redundant Velocity properties
as being considered multivalued
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1801822&r1=1801821&r2=1801822&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Thu Jul 13 09:54:52 2017
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.velocity.util.ExtProperties;
import org.slf4j.Logger;
import org.apache.velocity.Template;
@@ -517,7 +518,12 @@ public class VelocityView extends ViewTo
Properties properties = new Properties();
try
{
- properties.load(inputStream);
+ /* For backward compatibility reasons, keep using an ExtProperties
at load time,
+ so that redundant properties become multivalued.
+ */
+ ExtProperties extProps = new ExtProperties();
+ extProps.load(inputStream);
+ properties.putAll(extProps);
}
catch (IOException ioe)
{
