Author: pmouawad
Date: Mon Oct 17 20:08:23 2016
New Revision: 1765364

URL: http://svn.apache.org/viewvc?rev=1765364&view=rev
Log:
Bug 59945 For all JSR223 elements, if script language has not been chosen on 
the UI, the script will be interpreted as a groovy script.
Bugzilla Id: 59945

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

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java?rev=1765364&r1=1765363&r2=1765364&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java 
Mon Oct 17 20:08:23 2016
@@ -50,10 +50,15 @@ public abstract class ScriptingBeanInfoS
 
         p = property("scriptLanguage"); // $NON-NLS-1$
         p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-        p.setValue(DEFAULT, ""); // $NON-NLS-1$
+        if (JSR223TestElement.class.isAssignableFrom(beanClass) ) {
+            p.setValue(DEFAULT, "groovy"); // $NON-NLS-1$
+        } else {
+            p.setValue(DEFAULT, ""); // $NON-NLS-1$
+        }
         if (rb != null) {
             p.setValue(RESOURCE_BUNDLE, rb);
         }
+        
         p.setValue(TAGS, languageTags);
 
         createPropertyGroup("scriptingLanguage", // $NON-NLS-1$


Reply via email to