race condition in <fixcrlf>'s temp file creation. BZ 54393. Submitted by Jan Stolze.

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

CONTRIBUTORS

@@ -153,6 +153,7 @@ James Duncan Davidson
 Jan Cumps
 Jan Matèrne
 Jan Mynarik
+Jan Stolze
 Jason Hunter
 Jason Pettiss
 Jason Salter

WHATSNEW

@@ -18,7 +18,11 @@ Other changes:
    entries with long names.
 
  * <parallel> swallowed the status code of nested <fail> tasks.
-   Bugzilla Report 55539
+   Bugzilla Report 55539.
+
+ * a race condition could make <fixcrlf> tasks of parallel builds to
+   interfere with each other.
+   Bugzilla Report 54393.
 
 Changes from Ant 1.9.1 TO Ant 1.9.2
 ===================================

contributors.xml

@@ -626,18 +626,22 @@
     <middle>Duncan</middle>
     <last>Davidson</last>
   </name>
+  <name>
+    <first>Jan</first>
+    <last>Cumps</last>
+  </name>
   <name>
     <first>Jan</first>
     <last>Mat&#232;rne</last>
   </name>
-    <name>
-      <first>Jan</first>
-      <last>Cumps</last>
-    </name>
   <name>
     <first>Jan</first>
     <last>Mynarik</last>
   </name>
+  <name>
+    <first>Jan</first>
+    <last>Stolze</last>
+  </name>
   <name>
     <first>Jason</first>
     <last>Hunter</last>

src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

@@ -352,9 +352,9 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
             fcv = new Vector<FilterChain>(1);
             fcv.add(fc);
         }
-        File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null, true, false);
+        File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null, true, true);
         try {
-            FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, false, false,
+            FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, true, false,
                 encoding, outputEncoding == null ? encoding : outputEncoding,
                 getProject());