Author: sebb
Date: Fri Mar  9 10:59:40 2012
New Revision: 1298788

URL: http://svn.apache.org/viewvc?rev=1298788&view=rev
Log:
Bug 52868 - BSF language list should be sorted

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java?rev=1298788&r1=1298787&r2=1298788&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java Fri Mar  9 10:59:40 2012
@@ -19,6 +19,7 @@
 package org.apache.jmeter.util;
 
 import java.beans.PropertyDescriptor;
+import java.util.Arrays;
 import java.util.Properties;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
@@ -39,7 +40,8 @@ public abstract class BSFBeanInfoSupport
         for (Object language : languages.keySet()) {
             LANGUAGE_TAGS[i++] = language.toString();
         }
-        LANGUAGE_TAGS[i] = "jexl";
+        LANGUAGE_TAGS[i] = "jexl"; // $NON-NLS-1$
+        Arrays.sort(LANGUAGE_TAGS);
     }
 
     protected BSFBeanInfoSupport(Class<?> beanClass) {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1298788&r1=1298787&r2=1298788&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Mar  9 10:59:40 2012
@@ -78,6 +78,7 @@ When doing replacement of User Defined V
 <h3>Other Samplers</h3>
 <ul>
 <li>Bug 51737 - TCPSampler : Packet gets converted/corrupted</li>
+<li>Bug 52868 - BSF language list should be sorted</li>
 </ul>
 
 <h3>Controllers</h3>