svn commit: r1701569 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java

[cb...@apache.org]

Author: cbrisson
Date: Mon Sep  7 07:24:30 2015
New Revision: 1701569

URL: http://svn.apache.org/r1701569
Log:
fix wrong ValueParser change from commit 1700798

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

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=1701569&r1=1701568&r2=1701569&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 Mon Sep  7 07:24:30 2015
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.generi
  * under the License.
  */
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Locale;
 import java.util.Set;
@@ -70,7 +71,6 @@ public class ValueParser extends Convers
 
     public ValueParser()
     {
-        source = new TreeMap<String,Object>();
     }
 
     public ValueParser(Map<String,Object> source)
@@ -85,6 +85,11 @@ public class ValueParser extends Convers
 
     protected Map<String,Object> getSource()
     {
+        // If this method has not been overrided, make sure source is not null
+        if (source == null)
+        {
+            source = new HashMap<String, Object>();
+        }
         return this.source;
     }
 
@@ -531,6 +536,10 @@ public class ValueParser extends Convers
             if (entry.getKey().startsWith(subkey) &&
                 entry.getKey().length() > subkey.length())
             {
+                if (values == null)
+                {
+                    values = new HashMap<String, Object>();
+                }
                 values.put(entry.getKey().substring(subkey.length()),entry.getValue());
             }
         }