svn commit: r1702757 - in /velocity/tools/trunk: velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java

[cbrisson]

Author: cbrisson
Date: Sun Sep 13 11:42:29 2015
New Revision: 1702757

URL: http://svn.apache.org/r1702757
Log:
fix ParameterTool

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/java/org/apache/velocity/tools/view/ParameterTool.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=1702757&r1=1702756&r2=1702757&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
 Sun Sep 13 11:42:29 2015
@@ -83,14 +83,19 @@ public class ValueParser extends Convers
         this.source = source;
     }
 
-    protected Map<String,Object> getSource()
+    protected Map<String,Object> getSource(boolean create)
     {
         // If this method has not been overrided, make sure source is not null
-        if (source == null)
+        if (source == null && create)
         {
             source = new HashMap<String, Object>();
         }
-        return this.source;
+        return this.source;        
+    }
+
+    protected Map<String,Object> getSource()
+    {
+        return getSource(true);
     }
 
     /**

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=1702757&r1=1702756&r2=1702757&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
 Sun Sep 13 11:42:29 2015
@@ -171,7 +171,7 @@ public class ParameterTool extends Value
     @Override
     protected Map getSource()
     {
-        Map source = super.getSource();
+        Map source = super.getSource(false);
         if (source == null)
         {
             source = expandSingletonArrays(getRequest().getParameterMap());