You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2009/03/03 21:23:59 UTC

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

Author: nbubna
Date: Tue Mar  3 20:23:59 2009
New Revision: 749732

URL: http://svn.apache.org/viewvc?rev=749732&view=rev
Log:
only run subkeys thru get, not getValue

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

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java?rev=749732&r1=749731&r2=749732&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java Tue Mar  3 20:23:59 2009
@@ -150,7 +150,12 @@
      */
     public Object get(String key)
     {
-        return getValue(key);
+        Object value = getValue(key);
+        if (value == null && getSource() != null && getAllowSubkeys())
+        {
+            value = getSubkey(key);
+        }
+        return value;
     }
 
     /**
@@ -164,11 +169,7 @@
         {
             return null;
         }
-        Object value = getSource().get(key);
-        if (value == null && getAllowSubkeys()) {
-            value = getSubkey(key);
-        }
-        return value;
+        return getSource().get(key);
     }
 
     /**