You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/07 04:46:20 UTC
svn commit: r1500358 - in /jmeter/trunk:
src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java xdocs/changes.xml
Author: sebb
Date: Sun Jul 7 02:46:20 2013
New Revision: 1500358
URL: http://svn.apache.org/r1500358
Log:
JSR223 language entries are duplicated; fold to lower case
Bugzilla Id: 55208
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java?rev=1500358&r1=1500357&r2=1500358&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java Sun Jul 7 02:46:20 2013
@@ -18,9 +18,11 @@
package org.apache.jmeter.util;
-import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
+import java.util.Set;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
@@ -35,13 +37,13 @@ public abstract class JSR223BeanInfoSupp
private static final String[] LANGUAGE_TAGS;
static {
- List<String> shortNames = new ArrayList<String>();
+ Set<String> shortNames = new HashSet<String>();
ScriptEngineManager sem = new ScriptEngineManager();
final List<ScriptEngineFactory> engineFactories = sem.getEngineFactories();
for(ScriptEngineFactory fact : engineFactories){
List<String> names = fact.getNames();
for(String shortName : names) {
- shortNames.add(shortName);
+ shortNames.add(shortName.toLowerCase(Locale.ENGLISH));
}
}
LANGUAGE_TAGS = shortNames.toArray(new String[shortNames.size()]);
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1500358&r1=1500357&r2=1500358&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jul 7 02:46:20 2013
@@ -163,6 +163,7 @@ Transaction Controller now sets Response
<li><bugzilla>55056</bugzilla> - wasted work in Data.append()</li>
<li><bugzilla>55129</bugzilla> - Change Javadoc generation per CVE-2013-1571, VU#225657</li>
<li><bugzilla>55187</bugzilla> - Integer overflow when computing ONE_YEAR_MS in HTTP CacheManager</li>
+<li><bugzilla>55208</bugzilla> - JSR223 language entries are duplicated; fold to lower case</li>
</ul>
<!-- =================== Improvements =================== -->