svn commit: r1571644 - in /tiles/framework/trunk: ./ tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java

[mck]

Author: mck
Date: Tue Feb 25 10:54:42 2014
New Revision: 1571644

URL: http://svn.apache.org/r1571644
Log:
forward port r1571643
 with `svn merge -c1571643 ^/tiles/framework/branches/TILES_3_0_X .`

ref: http://thread.gmane.org/gmane.comp.apache.tiles.scm/576

Modified:
    tiles/framework/trunk/   (props changed)
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java

Propchange: tiles/framework/trunk/
------------------------------------------------------------------------------
  Merged /tiles/framework/branches/TILES_3_0_X:r1571643

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java?rev=1571644&r1=1571643&r2=1571644&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
 Tue Feb 25 10:54:42 2014
@@ -67,12 +67,15 @@ public final class PatternUtil {
      *
      * @param d The definition to replace.
      * @param name The name of the definition to be created.
-     * @param vars The variables to be substituted.
+     * @param varsOrig The variables to be substituted.
      * @return The definition that can be rendered.
      * @since 2.2.0
      */
     public static Definition replacePlaceholders(Definition d, String name,
-            Object... vars) {
+            Object... varsOrig) {
+
+        Object[] vars = replaceNullsWithBlank(varsOrig);
+
         Definition nudef = new Definition();
 
         nudef.setExtends(replace(d.getExtends(), vars));
@@ -229,4 +232,12 @@ public final class PatternUtil {
         }
         return st;
     }
+
+    private static Object[] replaceNullsWithBlank(Object[] varsOrig) {
+        Object[] vars = new Object[varsOrig.length];
+        for(int i = 0; i < varsOrig.length; ++i) {
+            vars[i] = null != varsOrig[i] ? varsOrig[i] : "";
+        }
+        return vars;
+    }
 }