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 2008/04/24 16:59:31 UTC

svn commit: r651285 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java

Author: nbubna
Date: Thu Apr 24 07:59:17 2008
New Revision: 651285

URL: http://svn.apache.org/viewvc?rev=651285&view=rev
Log:
VELTOOLS-104 process resources with MessageFormat even if no args were given

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

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java?rev=651285&r1=651284&r2=651285&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java Thu Apr 24 07:59:17 2008
@@ -208,12 +208,7 @@
      */
     public String render(Object resource, Object[] args)
     {
-        String value = String.valueOf(resource);
-        if (args == null)
-        {
-            return value;
-        }
-        return MessageFormat.format(value, args);
+        return MessageFormat.format(String.valueOf(resource), args);
     }