The file denoted by the returned abstract pathname did not - * exist before this method was invoked, any subsequent invocation - * of this method will yield a different file name.
- * - *As of ant 1.8 the file is actually created.
- * - * @param prefix prefix before the random number. - * @param suffix file extension; include the '.'. - * @param parentDir Directory to create the temporary file in; - * java.io.tmpdir used if not specified. - * - * @return a File reference to the new temporary file. - * @since Ant 1.5 + * Create a File object for a temporary file in a given directory. Without + * actually creating the file. + * + *+ * The file denoted by the returned abstract pathname did not exist before + * this method was invoked, any subsequent invocation of this method will + * yield a different file name. + *
+ *+ * The filename is prefixNNNNNsuffix where NNNN is a random number. + *
+ * + * @param prefix + * prefix before the random number. + * @param suffix + * file extension; include the '.'. + * @param parentDir + * Directory to create the temporary file in; java.io.tmpdir used + * if not specified. + * + * @deprecated since ant 1.8 use createTempFile(String, String, File, + * boolean, boolean) instead. + * @return a File reference to the new, nonexistent temporary file. */ public File createTempFile(String prefix, String suffix, File parentDir) { - return createTempFile(prefix, suffix, parentDir, false); + return createTempFile(prefix, suffix, parentDir, false, false); } /** @@ -811,29 +819,43 @@ public class FileUtils { * exist before this method was invoked, any subsequent invocation * of this method will yield a different file name. * - *As of ant 1.8 the file is actually created.
- * * @param prefix prefix before the random number. * @param suffix file extension; include the '.'. * @param parentDir Directory to create the temporary file in; * java.io.tmpdir used if not specified. * @param deleteOnExit whether to set the tempfile for deletion on * normal VM exit. + * @param createFile true if the file must actually be created. If false + * chances exist that a file with the same name is created in the time + * between invoking this method and the moment the file is actually created. + * If possible set to true. * * @return a File reference to the new temporary file. - * @since Ant 1.7 + * @since Ant 1.8 */ public File createTempFile(String prefix, String suffix, File parentDir, - boolean deleteOnExit) { + boolean deleteOnExit, boolean createFile) { File result = null; - String parent = (parentDir == null) - ? System.getProperty("java.io.tmpdir") - : parentDir.getPath(); - try { - result = File.createTempFile(prefix, suffix, new File(parent)); - } catch (IOException e) { - throw new BuildException("Could not create tempfile in " + parent, e); + String parent = (parentDir == null) ? System + .getProperty("java.io.tmpdir") : parentDir.getPath(); + + if (createFile) { + try { + result = File.createTempFile(prefix, suffix, new File(parent)); + } catch (IOException e) { + throw new BuildException("Could not create tempfile in " + + parent, e); + } + } else { + DecimalFormat fmt = new DecimalFormat("#####"); + synchronized (rand) { + do { + result = new File(parent, prefix + + fmt.format(Math.abs(rand.nextInt())) + suffix); + } while (result.exists()); + } } + if (deleteOnExit) { result.deleteOnExit(); } @@ -843,41 +865,33 @@ public class FileUtils { /** * Create a File object for a temporary file in a given directory. Without * actually creating the file. - * - *The file denoted by the returned abstract pathname did not - * exist before this method was invoked, any subsequent invocation - * of this method will yield a different file name.
+ * + *+ * The file denoted by the returned abstract pathname did not exist before + * this method was invoked, any subsequent invocation of this method will + * yield a different file name. + *
** The filename is prefixNNNNNsuffix where NNNN is a random number. *
- * - * @param prefix prefix before the random number. - * @param suffix file extension; include the '.'. - * @param parentDir Directory to create the temporary file in; - * java.io.tmpdir used if not specified. - * @param deleteOnExit whether to set the tempfile for deletion on - * normal VM exit. - * + * + * @param prefix + * prefix before the random number. + * @param suffix + * file extension; include the '.'. + * @param parentDir + * Directory to create the temporary file in; java.io.tmpdir used + * if not specified. + * @param deleteOnExit + * whether to set the tempfile for deletion on normal VM exit. + * + * @deprecated since ant 1.8 use createTempFile(String, String, File, + * boolean, boolean) instead. * @return a File reference to the new, nonexistent temporary file. - * @since Ant 1.8 */ - public File createTempFileName(String prefix, String suffix, + public File createTempFile(String prefix, String suffix, File parentDir, boolean deleteOnExit) { - File result = null; - String parent = (parentDir == null) ? System - .getProperty("java.io.tmpdir") : parentDir.getPath(); - - DecimalFormat fmt = new DecimalFormat("#####"); - synchronized (rand) { - do { - result = new File(parent, prefix - + fmt.format(Math.abs(rand.nextInt())) + suffix); - } while (result.exists()); - } - if (deleteOnExit) { - result.deleteOnExit(); - } - return result; + return createTempFile(prefix, suffix, parentDir, deleteOnExit, false); } /** diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index 859573038..37ea25786 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -440,7 +440,7 @@ public final class JavaEnvUtils { */ public static File createVmsJavaOptionFile(String[] cmd) throws IOException { - File script = FILE_UTILS.createTempFile("ANT", ".JAVA_OPTS", null); + File script = FILE_UTILS.createTempFile("ANT", ".JAVA_OPTS", null, false, true); PrintWriter out = null; try { out = new PrintWriter(new BufferedWriter(new FileWriter(script))); 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 a4e7eda88..d3a143f22 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.createTempFileName("spawn","log", project.getBaseDir(), false); + logFile = FILE_UTILS.createTempFile("spawn","log", project.getBaseDir(), false, 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 1cc2089bc..a5ae68622 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.createTempFileName("spawn","log", project.getBaseDir(), false); + File logFile = FILE_UTILS.createTempFile("spawn","log", project.getBaseDir(), false, 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 d25dd138a..e3265eccf 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 @@ -390,7 +390,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest { * configure() method of ModifiedSelector. This testcase tests that. */ public void testCreatePropertiesCacheViaCustomSelector() { - File cachefile = FILE_UTILS.createTempFileName("tmp-cache-", ".properties", null, false); + File cachefile = FILE_UTILS.createTempFile("tmp-cache-", ".properties", null, false, false); try { // initialize test environment (called "bed") makeBed(); diff --git a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java index 27b5c3d3a..baeffb794 100644 --- a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java @@ -342,55 +342,50 @@ public class FileUtilsTest extends TestCase { */ public void testCreateTempFile() { - // null parent dir - File tmp1 = FILE_UTILS.createTempFile("pre", ".suf", null, false); - String tmploc = System.getProperty("java.io.tmpdir"); - String name = tmp1.getName(); - assertTrue("starts with pre", name.startsWith("pre")); - assertTrue("ends with .suf", name.endsWith(".suf")); - assertTrue("File was created", tmp1.exists()); - assertEquals((new File(tmploc, tmp1.getName())).getAbsolutePath(), - tmp1.getAbsolutePath()); - tmp1.delete(); - - File dir2 = new File(tmploc+"/ant-test"); - dir2.mkdir(); - removeThis = dir2; - - File tmp2 = FILE_UTILS.createTempFile("pre", ".suf", dir2, true); - String name2 = tmp2.getName(); - assertTrue("starts with pre", name2.startsWith("pre")); - assertTrue("ends with .suf", name2.endsWith(".suf")); - assertTrue("File was created", tmp2.exists()); - assertEquals((new File(dir2, tmp2.getName())).getAbsolutePath(), - tmp2.getAbsolutePath()); - tmp2.delete(); - dir2.delete(); - } - /** - * Test createTempFileName - */ - public void testCreateTempFileName() { + // null parent dir + File tmp1 = FILE_UTILS.createTempFile("pre", ".suf", null, false, true); + String tmploc = System.getProperty("java.io.tmpdir"); + String name = tmp1.getName(); + assertTrue("starts with pre", name.startsWith("pre")); + assertTrue("ends with .suf", name.endsWith(".suf")); + assertTrue("File was created", tmp1.exists()); + assertEquals((new File(tmploc, tmp1.getName())).getAbsolutePath(), tmp1 + .getAbsolutePath()); + tmp1.delete(); + + File dir2 = new File(tmploc + "/ant-test"); + dir2.mkdir(); + removeThis = dir2; + + File tmp2 = FILE_UTILS.createTempFile("pre", ".suf", dir2, true, true); + String name2 = tmp2.getName(); + assertTrue("starts with pre", name2.startsWith("pre")); + assertTrue("ends with .suf", name2.endsWith(".suf")); + assertTrue("File was created", tmp2.exists()); + assertEquals((new File(dir2, tmp2.getName())).getAbsolutePath(), tmp2 + .getAbsolutePath()); + tmp2.delete(); + dir2.delete(); + File parent = new File((new File("/tmp")).getAbsolutePath()); - File tmp1 = FILE_UTILS.createTempFileName("pre", ".suf", parent, false); + tmp1 = FILE_UTILS.createTempFile("pre", ".suf", parent, false); assertTrue("new file", !tmp1.exists()); - String name = tmp1.getName(); + name = tmp1.getName(); assertTrue("starts with pre", name.startsWith("pre")); assertTrue("ends with .suf", name.endsWith(".suf")); - assertEquals("is inside parent dir", - parent.getAbsolutePath(), - tmp1.getParent()); + assertEquals("is inside parent dir", parent.getAbsolutePath(), tmp1 + .getParent()); - File tmp2 = FILE_UTILS.createTempFileName("pre", ".suf", parent, false); - assertTrue("files are different", - !tmp1.getAbsolutePath().equals(tmp2.getAbsolutePath())); + tmp2 = FILE_UTILS.createTempFile("pre", ".suf", parent, false); + assertTrue("files are different", !tmp1.getAbsolutePath().equals( + tmp2.getAbsolutePath())); // null parent dir - File tmp3 = FILE_UTILS.createTempFileName("pre", ".suf", null, false); - String tmploc = System.getProperty("java.io.tmpdir"); - assertEquals((new File(tmploc, tmp3.getName())).getAbsolutePath(), - tmp3.getAbsolutePath()); + File tmp3 = FILE_UTILS.createTempFile("pre", ".suf", null, false); + tmploc = System.getProperty("java.io.tmpdir"); + assertEquals((new File(tmploc, tmp3.getName())).getAbsolutePath(), tmp3 + .getAbsolutePath()); } /**