velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1806598 - in /velocity/tools/trunk: velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml
Date Tue, 29 Aug 2017 14:35:15 GMT
Author: cbrisson
Date: Tue Aug 29 14:35:15 2017
New Revision: 1806598

URL: http://svn.apache.org/viewvc?rev=1806598&view=rev
Log:
[tools] Better fix for the ParameterTool strings splitting problem: no splitting on empty
delimiter

Modified:
    velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
    velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml

Modified: velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java?rev=1806598&r1=1806597&r2=1806598&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
(original)
+++ velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
Tue Aug 29 14:35:15 2017
@@ -255,7 +255,7 @@ public class ValueParser extends FormatC
     protected String[] parseStringList(String value)
     {
         String[] values;
-        if (value.indexOf(stringsDelimiter) < 0)
+        if (stringsDelimiter.length() == 0 || value.indexOf(stringsDelimiter) < 0)
         {
             values = new String[] { value };
         }

Modified: velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml?rev=1806598&r1=1806597&r2=1806598&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml
Tue Aug 29 14:35:15 2017
@@ -28,7 +28,7 @@
         <tool class="org.apache.velocity.tools.view.JsonTool"/>
         <tool class="org.apache.velocity.tools.view.LinkTool"/>
         <tool class="org.apache.velocity.tools.view.PagerTool"/>
-        <tool class="org.apache.velocity.tools.view.ParameterTool" stringsDelimiter="__NO_STRINGS_DELIMITER_IN_WEB_CONTEXT__"/>
+        <tool class="org.apache.velocity.tools.view.ParameterTool" stringsDelimiter=""/>
         <tool class="org.apache.velocity.tools.view.ViewContextTool"/>
         <tool class="org.apache.velocity.tools.view.XmlTool"/>
         <!--



Mime
View raw message