On 07/09/2015 08:27, Sergiu Dumitriu wrote:
On 09/02/2015 08:57 AM, cbris...@apache.org wrote:
Author: cbrisson
Date: Wed Sep 2 12:57:21 2015
New Revision: 1700798
URL: http://svn.apache.org/r1700798
Log:
[tools] switch to SLF4J logging facade
[...]
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=1700798&r1=1700797&r2=1700798&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
Wed Sep 2 12:57:21 2015
@@ -22,7 +22,7 @@ package org.apache.velocity.tools.generi
import java.util.Map;
import java.util.Locale;
import java.util.Set;
-import java.util.HashMap;
+import java.util.TreeMap;
import java.util.Collection;
import org.apache.velocity.tools.config.DefaultKey;
@@ -68,7 +68,10 @@ public class ValueParser extends Convers
*/
public static final String READONLY_KEY = "readOnly";
- public ValueParser() {}
+ public ValueParser()
+ {
+ source = new TreeMap<String,Object>();
+ }
public ValueParser(Map<String,Object> source)
{
@@ -528,11 +531,6 @@ public class ValueParser extends Convers
if (entry.getKey().startsWith(subkey) &&
entry.getKey().length() > subkey.length())
{
- if(values == null)
- {
- values = new HashMap<String,Object>();
- }
-
This removal looks like a bug, the "values" variable is never initialized.
I went too fast. Sorry about that. Mixed "source" and "values".
It also doesn't have anything to do with the logger switch, so it
shouldn't have been included in this commit.
It has everything to do with it, as I was fixing a test case
(org.apache.velocity.tools.test.blackbox.LinkToolTests).
Claude
values.put(entry.getKey().substring(subkey.length()),entry.getValue());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@velocity.apache.org
For additional commands, e-mail: dev-h...@velocity.apache.org
