diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-03-04 21:48:43 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2002-03-04 21:48:43 +0000 |
| commit | e2c44b08d79dbbbb6ddd4d1544a90d4d1cc5f8d2 (patch) | |
| tree | 5931c09eed2765f6710e674547ac26b347e50693 | |
| parent | 773f182dd2710914b9519857b4ce51b83b5bb1fe (diff) | |
| download | classpath-e2c44b08d79dbbbb6ddd4d1544a90d4d1cc5f8d2.tar.gz | |
* THANKYOU: Add Sascha Brawer
* java/lang/System.java (static): Set java.io.tmpdir from java.tmpdir
if not yet set.
* java/io/File.java (createTempFile): Use java.io.tmpdir property not
java.tmpdir.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | THANKYOU | 1 | ||||
| -rw-r--r-- | java/io/File.java | 6 | ||||
| -rw-r--r-- | java/lang/System.java | 5 |
4 files changed, 17 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2002-03-03 Mark Wielaard <mark@klomp.org> + * THANKYOU: Add Sascha Brawer + * java/lang/System.java (static): Set java.io.tmpdir from java.tmpdir + if not yet set. + * java/io/File.java (createTempFile): Use java.io.tmpdir property not + java.tmpdir. + +2002-03-03 Mark Wielaard <mark@klomp.org> + * java/awt/Font.java (decode): Catch NumberFormatException. 2002-03-03 Mark Wielaard <mark@klomp.org> @@ -24,3 +24,4 @@ Fred Gray (fegray@npl.uiuc.edu) Isaac Jones (ijones@cis.ohio-state.edu) Patrick Doyle (doylep@eecg.toronto.edu) Shuhua Zhang (Shuhua.Zhang@echostar.com) +Sascha Brawer (brawer@acm.org) diff --git a/java/io/File.java b/java/io/File.java index ba608e0f8..c30eff521 100644 --- a/java/io/File.java +++ b/java/io/File.java @@ -123,7 +123,7 @@ private String path; * files created are guaranteed not to currently exist and the same file name * will never be used twice in the same virtual machine instance. The * system temporary directory is determined by examinging the - * <code>java.tmpdir</code> system property. + * <code>java.io.tmpdir</code> system property. * <p> * The <code>prefix</code> parameter is a sequence of at least three * characters that are used as the start of the generated filename. The @@ -160,7 +160,7 @@ createTempFile(String prefix, String suffix) throws IllegalArgumentException, * directory. The files created are guaranteed not to currently exist and the * same file name will never be used twice in the same virtual machine instance. * The system temporary directory is determined by examinging the - * <code>java.tmpdir</code> system property. + * <code>java.io.tmpdir</code> system property. * <p> * The <code>prefix</code> parameter is a sequence of at least three * characters that are used as the start of the generated filename. The @@ -186,7 +186,7 @@ createTempFile(String prefix, String suffix, File directory) // Grab the system temp directory if necessary if (directory == null) { - String dirname = System.getProperty("java.tmpdir"); + String dirname = System.getProperty("java.io.tmpdir"); if (dirname == null) throw new IOException("Cannot determine system temporary directory"); diff --git a/java/lang/System.java b/java/lang/System.java index 2efd571e8..9f6283bbe 100644 --- a/java/lang/System.java +++ b/java/lang/System.java @@ -119,6 +119,11 @@ public class System { properties = new Properties(); VMSystem.insertSystemProperties(properties); + + // XXX FIXME - Temp hack for old systems that set the wrong property + if (properties.get("java.io.tmpdir") == null) + properties.put("java.io.tmpdir", properties.get("java.tmpdir")); + insertGNUProperties(); in = new FileInputStream(FileDescriptor.in); out = new PrintStream(new FileOutputStream(FileDescriptor.out)); |