All instances of the same scriptdef task shared a single ScriptRunner, causing problems in multithreaded situations. Submitted by Valentino Miazzo. PR 41602

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@834354 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -334,6 +334,7 @@ Tom May
 Tomasz Bech
 Trejkaz Xaoza
 Ulrich Schmidt
+Valentino Miazzo
 Victor Toni
 Vincent Legoll
 Waldek Herka

WHATSNEW

@@ -526,6 +526,10 @@ Fixed bugs:
    compatibility to Ant 1.7.0.
    Bugzilla Report 48040.
 
+ * different task instances of the same <scriptdef>ed tasks could
+   overwrite each others attributes/nested elements.
+   Bugzilla Report 41602.
+
 Other changes:
 --------------
 

contributors.xml

@@ -1353,6 +1353,10 @@
     <first>Ulrich</first>
     <last>Schmidt</last>
   </name>
+  <name>
+    <first>Valentino</first>
+    <last>Miazzo</last>
+  </name>
   <name>
     <first>Victor</first>
     <last>Toni</last>

src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java

@@ -50,11 +50,6 @@ public class ScriptDef extends DefBase {
      * script runner helper
      */
     private ScriptRunnerHelper helper = new ScriptRunnerHelper();
-    /**
-     * script runner.
-     */
-    /** Used to run the script */
-    private ScriptRunnerBase   runner = null;
 
     /** the name by which this script will be activated */
     private String name;
@@ -203,9 +198,6 @@ public class ScriptDef extends DefBase {
             helper.setClassLoader(createLoader());
         }
 
-        // Now create the scriptRunner
-        runner = helper.getScriptRunner();
-
         attributeSet = new HashSet();
         for (Iterator i = attributes.iterator(); i.hasNext();) {
             Attribute attribute = (Attribute) i.next();
@@ -348,6 +340,7 @@ public class ScriptDef extends DefBase {
      * @param instance   the script instance; can be null
      */
     public void executeScript(Map attributes, Map elements, ScriptDefBase instance) {
+        ScriptRunnerBase runner = helper.getScriptRunner();
         runner.addBean("attributes", attributes);
         runner.addBean("elements", elements);
         runner.addBean("project", getProject());