[seam-commits] Seam SVN: r15476 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core.

Author: manaRH Date: 2013-04-08 04:27:01 -0400 (Mon, 08 Apr 2013) New Revision: 15476 Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Interpolator.java Log: bz947542 fixed NPE Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Interpolator.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Interpolator.java 2013-04-08 08:12:40 UTC (rev 15475) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Interpolator.java 2013-04-08 08:27:01 UTC (rev 15476) @@ -61,6 +61,11 @@ throw new IllegalArgumentException("more than 10 parameters"); } + if (string == null) + { + string = ""; + } + if (string.indexOf('#') >= 0 || string.indexOf('{') >= 0) { string = interpolateExpressions(string, params);