You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/09/03 23:06:50 UTC

svn commit: r1380359 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

Author: pmouawad
Date: Mon Sep  3 21:06:48 2012
New Revision: 1380359

URL: http://svn.apache.org/viewvc?rev=1380359&view=rev
Log:
Oups JDK6 method

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1380359&r1=1380358&r2=1380359&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Mon Sep  3 21:06:48 2012
@@ -535,8 +535,9 @@ public class JMeterUtils implements Unit
     public static String getLocaleString(String locale){
         // All keys in messages.properties are lowercase (historical reasons?)
         String resKey = locale.toLowerCase(java.util.Locale.ENGLISH);
-        if(resources.containsKey(resKey)) {
+        try {
             return resources.getString(resKey);
+        } catch (MissingResourceException e) {
         }
         return locale;
     }



Re: svn commit: r1380359 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

Posted by sebb <se...@gmail.com>.
On 3 September 2012 22:06,  <pm...@apache.org> wrote:
> Author: pmouawad
> Date: Mon Sep  3 21:06:48 2012
> New Revision: 1380359
>
> URL: http://svn.apache.org/viewvc?rev=1380359&view=rev
> Log:
> Oups JDK6 method

In that case, add a comment so it can be revisited later.

> Modified:
>     jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1380359&r1=1380358&r2=1380359&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Mon Sep  3 21:06:48 2012
> @@ -535,8 +535,9 @@ public class JMeterUtils implements Unit
>      public static String getLocaleString(String locale){
>          // All keys in messages.properties are lowercase (historical reasons?)
>          String resKey = locale.toLowerCase(java.util.Locale.ENGLISH);
> -        if(resources.containsKey(resKey)) {
> +        try {
>              return resources.getString(resKey);
> +        } catch (MissingResourceException e) {
>          }
>          return locale;
>      }
>
>