svn commit: r1525078 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW contributors.xml src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

[bodewig]

Author: bodewig
Date: Fri Sep 20 18:21:43 2013
New Revision: 1525078

URL: http://svn.apache.org/r1525078
Log:
race condition in <fixcrlf>'s temp file creation.  BZ 54393. Submitted by Jan 
Stolze.

Modified:
    ant/core/trunk/CONTRIBUTORS
    ant/core/trunk/WHATSNEW
    ant/core/trunk/contributors.xml
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

Modified: ant/core/trunk/CONTRIBUTORS
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=1525078&r1=1525077&r2=1525078&view=diff
==============================================================================
--- ant/core/trunk/CONTRIBUTORS (original)
+++ ant/core/trunk/CONTRIBUTORS Fri Sep 20 18:21:43 2013
@@ -153,6 +153,7 @@ James Duncan Davidson
 Jan Cumps
 Jan Matèrne
 Jan Mynarik
+Jan Stolze
 Jason Hunter
 Jason Pettiss
 Jason Salter

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1525078&r1=1525077&r2=1525078&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Sep 20 18:21:43 2013
@@ -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
 ===================================

Modified: ant/core/trunk/contributors.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=1525078&r1=1525077&r2=1525078&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Fri Sep 20 18:21:43 2013
@@ -628,17 +628,21 @@
   </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>
   </name>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java?rev=1525078&r1=1525077&r2=1525078&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Fri Sep 
20 18:21:43 2013
@@ -352,9 +352,9 @@ public class FixCRLF extends MatchingTas
             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());