diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 280ecc38f..9ae1eaa56 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -341,8 +341,7 @@ public class FixCRLF extends MatchingTask implements ChainableReader { fcv = new Vector(1); fcv.add(fc); } - File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null); - tmpFile.deleteOnExit(); + File tmpFile = FILE_UTILS.createTempFileName("fixcrlf", "", null, true); try { FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, false, false, encoding, outputEncoding == null ? encoding : outputEncoding, diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 52b142682..6f86205c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -577,9 +577,8 @@ public class Zip extends MatchingTask { /** rename the zip file. */ private File renameFile() { - File renamedFile = FILE_UTILS.createTempFile( - "zip", ".tmp", zipFile.getParentFile()); - renamedFile.deleteOnExit(); + File renamedFile = FILE_UTILS.createTempFileName( + "zip", ".tmp", zipFile.getParentFile(), true); try { FILE_UTILS.rename(zipFile, renamedFile); } catch (SecurityException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index 7b845cd8e..0a91930f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -412,8 +412,8 @@ public class Symlink extends DispatchTask { File canfil = linkfil.getCanonicalFile(); // rename the resource, thus breaking the link: - File temp = FILE_UTILS.createTempFile("symlink", ".tmp", - canfil.getParentFile()); + File temp = FILE_UTILS.createTempFileName("symlink", ".tmp", + canfil.getParentFile(), false); try { try { FILE_UTILS.rename(canfil, temp); diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index 04b7a94ce..7960509fe 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -445,7 +445,7 @@ public class ModifiedSelector extends BaseExtendSelector // How to handle non-file-Resources? I copy temporarily the // resource to a file and use the file-implementation. FileUtils fu = FileUtils.getFileUtils(); - File tmpFile = fu.createTempFile("modified-", ".tmp", null); + File tmpFile = fu.createTempFileName("modified-", ".tmp", null, true); Resource tmpResource = new FileResource(tmpFile); ResourceUtils.copyResource(resource, tmpResource); boolean isSelected = isSelected(tmpFile.getParentFile(), diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java index 34ff1102e..a4e7eda88 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java @@ -347,7 +347,7 @@ public class ExecTaskTest extends BuildFileTest { return; } myBuild = new MonitoredBuild(new File(System.getProperty("root"), BUILD_FILE), "spawn"); - logFile = FILE_UTILS.createTempFile("spawn","log", project.getBaseDir()); + logFile = FILE_UTILS.createTempFileName("spawn","log", project.getBaseDir(), false); // this is guaranteed by FileUtils#createTempFile assertTrue("log file not existing", !logFile.exists()); // make the spawned process run 4 seconds diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java index 3ae80c1e5..1cc2089bc 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java @@ -175,7 +175,7 @@ public class JavaTest extends BuildFileTest { } public void testSpawn() { - File logFile = FILE_UTILS.createTempFile("spawn","log", project.getBaseDir()); + File logFile = FILE_UTILS.createTempFileName("spawn","log", project.getBaseDir(), false); // this is guaranteed by FileUtils#createTempFile assertTrue("log file not existing", !logFile.exists()); project.setProperty("logFile", logFile.getAbsolutePath()); diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java index b1ebf05ff..b307b0788 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java @@ -391,7 +391,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest { * configure() method of ModifiedSelector. This testcase tests that. */ public void testCreatePropertiesCacheViaCustomSelector() { - File cachefile = FILE_UTILS.createTempFile("tmp-cache-", ".properties", null); + File cachefile = FILE_UTILS.createTempFileName("tmp-cache-", ".properties", null, false); try { // initialize test environment (called "bed") makeBed();