Author: thomas.heute(a)jboss.com Date: 2010-10-27 10:33:53 -0400 (Wed, 27 Oct 2010) New Revision: 4862 Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java Log: JBEPP-588: Check null to catch exception of WebuiBindingContext.appRes Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java 2010-10-27 12:28:29 UTC (rev 4861) +++ epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java 2010-10-27 14:33:53 UTC (rev 4862) @@ -89,7 +89,7 @@ public String appRes(String mesgKey) throws Exception { - String value; + String value = ""; try { ResourceBundle res = rcontext_.getApplicationResourceBundle(); @@ -99,7 +99,8 @@ { if (PropertyManager.isDevelopping()) log.warn("Can not find resource bundle for key : " + mesgKey); - value = mesgKey.substring(mesgKey.lastIndexOf('.') + 1); + if(mesgKey != null) + value = mesgKey.substring(mesgKey.lastIndexOf('.') + 1); } return value; }