You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/09/17 22:12:21 UTC
svn commit: r696426 -
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java
Author: tellison
Date: Wed Sep 17 13:12:21 2008
New Revision: 696426
URL: http://svn.apache.org/viewvc?rev=696426&view=rev
Log:
Simplify code, and avoid looking up system property when it won't be used.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java?rev=696426&r1=696425&r2=696426&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java Wed Sep 17 13:12:21 2008
@@ -1140,18 +1140,23 @@
* @throws IOException
* If an error occurs when writing the file
*/
+ @SuppressWarnings("nls")
public static File createTempFile(String prefix, String suffix,
File directory) throws IOException {
// Force a prefix null check first
if (prefix.length() < 3) {
- throw new IllegalArgumentException(Msg.getString("K006b")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Msg.getString("K006b"));
+ }
+ String newSuffix = suffix == null ? ".tmp" : suffix;
+ File tmpDirFile;
+ if (directory == null) {
+ String tmpDir = AccessController.doPrivileged(
+ new PriviAction<String>("java.io.tmpdir", "."));
+ tmpDirFile = new File(tmpDir);
+ } else {
+ tmpDirFile = directory;
}
- String newSuffix = suffix == null ? ".tmp" : suffix; //$NON-NLS-1$
- String tmpDir = "."; //$NON-NLS-1$
- tmpDir = AccessController.doPrivileged(new PriviAction<String>(
- "java.io.tmpdir", ".")); //$NON-NLS-1$//$NON-NLS-2$
- File result, tmpDirFile = directory == null ? new File(tmpDir)
- : directory;
+ File result;
do {
result = genTempFile(prefix, newSuffix, tmpDirFile);
} while (!result.createNewFile());