2003-10-22 Michael Koch <konqueror@gmx.de>

* java/io/File.java
	(equals): Removed redundant obj == null check.
	(createTempFile): Merged comments from classpath.

From-SVN: r72790
This commit is contained in:
Michael Koch 2003-10-22 08:47:12 +00:00 committed by Michael Koch
parent 65f1ebd15e
commit 8c754b9197
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2003-10-22 Michael Koch <konqueror@gmx.de>
* java/io/File.java
(equals): Removed redundant obj == null check.
(createTempFile): Merged comments from classpath.
2003-10-21 Sascha Brawer <brawer@dandelis.ch>
Fix for bug #2944, reported by David Holmes <dholmes@dltech.com.au>

View File

@ -111,7 +111,7 @@ public class File implements Serializable, Comparable
* is taken from the <code>path.separator</code> system property.
*/
public static final char pathSeparatorChar = pathSeparator.charAt(0);
static final String tmpdir = System.getProperty("java.io.tmpdir");
static int maxPathLen;
static boolean caseSensitive;
@ -246,9 +246,6 @@ public class File implements Serializable, Comparable
*/
public boolean equals (Object obj)
{
if (obj == null)
return false;
if (! (obj instanceof File))
return false;
@ -1006,10 +1003,11 @@ public class File implements Serializable, Comparable
+ " is not really a directory.");
}
// Now process the prefix and suffix.
// Check if prefix is at least 3 characters long
if (prefix.length() < 3)
throw new IllegalArgumentException ("Prefix too short: " + prefix);
// Set default value of suffix
if (suffix == null)
suffix = ".tmp";