From 4b83ca537a467b47c7983fe16b09e123d8e18648 Mon Sep 17 00:00:00 2001
From: Philippe Mouawad <pmouawad@apache.org>
Date: Thu, 11 Aug 2016 18:56:09 +0000
Subject: [PATCH] Bug 59964 - JSR223 Test Element : Cache compiled script if
 available is not correctly reset Contributed by Ubik Load Pack Bugzilla Id:
 59964

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1756029 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/jmeter/util/ScriptingBeanInfoSupport.java | 9 ++++++++-
 xdocs/changes.xml                                        | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java b/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
index b12dfcb457..82221a084b 100644
--- a/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
+++ b/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java
@@ -29,6 +29,7 @@ import java.util.UUID;
 import javax.swing.JCheckBox;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.gui.ClearGui;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.gui.FileEditor;
@@ -116,7 +117,7 @@ public abstract class ScriptingBeanInfoSupport extends BeanInfoSupport {
         
     }
     
-    public static class JSR223ScriptCacheCheckboxEditor extends PropertyEditorSupport implements ActionListener {
+    public static class JSR223ScriptCacheCheckboxEditor extends PropertyEditorSupport implements ActionListener, ClearGui {
 
         private final JCheckBox checkbox;
 
@@ -198,5 +199,11 @@ public abstract class ScriptingBeanInfoSupport extends BeanInfoSupport {
         public boolean supportsCustomEditor() {
             return true;
         }
+
+        @Override
+        public void clearGui() {
+            initialValue = null;
+            checkbox.setSelected(false);
+        }
     }
 }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index fdcaac5ef4..fb5e607b33 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -172,6 +172,7 @@ Summary
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
+    <li><bug>59964</bug>JSR223 Test Element : Cache compiled script if available is not correctly reset. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
 </ul>
 
 <h3>Functions</h3>