Author: sebb Date: Fri May 1 23:31:01 2009 New Revision: 770860 URL: http://svn.apache.org/viewvc?rev=770860&view=rev Log: Avoid adding empty language
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=770860&r1=770859&r2=770860&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Fri May 1 23:31:01 2009 @@ -345,10 +345,13 @@ lang.add(Locale.JAPANESE.toString()); // ja lang.add(Locale.SIMPLIFIED_CHINESE.toString()); // zh_CN lang.add(Locale.TRADITIONAL_CHINESE.toString()); // zh_TW - String [] addLanguages =JMeterUtils.getPropDefault("locales.add","").split(","); // $NON-NLS-1$ - for(int i=0; i < addLanguages.length; i++){ - log.info("Adding locale "+addLanguages[i]); - lang.add(addLanguages[i]); + final String addedLocales = JMeterUtils.getProperty("locales.add"); + if (addedLocales != null){ + String [] addLanguages =addedLocales.split(","); // $NON-NLS-1$ + for(int i=0; i < addLanguages.length; i++){ + log.info("Adding locale "+addLanguages[i]); + lang.add(addLanguages[i]); + } } return (String[]) lang.toArray(new String[lang.size()]); } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org