Author: chris.laprun(a)jboss.com Date: 2012-02-20 16:46:06 -0500 (Mon, 20 Feb 2012) New Revision: 8439 Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java Log: - Fixed potential NPE. Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-02-20 21:38:57 UTC (rev 8438) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-02-20 21:46:06 UTC (rev 8439) @@ -55,12 +55,16 @@ { for (int i = 0; i < messageArgs_.length; i++) { - String arg = messageArgs_[i].toString(); - if (isArgsLocalized()) + final Object messageArg = messageArgs_[i]; + if (messageArg != null) { - arg = resolveMessage(arg); + String arg = messageArg.toString(); + if (isArgsLocalized()) + { + arg = resolveMessage(arg); + } + msg = msg.replace("{" + i + "}", arg); } - msg = msg.replace("{" + i + "}", arg); } }