Commit 8c754b91 by Michael Koch Committed by Michael Koch

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
parent 65f1ebd1
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> 2003-10-21 Sascha Brawer <brawer@dandelis.ch>
Fix for bug #2944, reported by David Holmes <dholmes@dltech.com.au> Fix for bug #2944, reported by David Holmes <dholmes@dltech.com.au>
......
...@@ -111,7 +111,7 @@ public class File implements Serializable, Comparable ...@@ -111,7 +111,7 @@ public class File implements Serializable, Comparable
* is taken from the <code>path.separator</code> system property. * is taken from the <code>path.separator</code> system property.
*/ */
public static final char pathSeparatorChar = pathSeparator.charAt(0); public static final char pathSeparatorChar = pathSeparator.charAt(0);
static final String tmpdir = System.getProperty("java.io.tmpdir"); static final String tmpdir = System.getProperty("java.io.tmpdir");
static int maxPathLen; static int maxPathLen;
static boolean caseSensitive; static boolean caseSensitive;
...@@ -246,9 +246,6 @@ public class File implements Serializable, Comparable ...@@ -246,9 +246,6 @@ public class File implements Serializable, Comparable
*/ */
public boolean equals (Object obj) public boolean equals (Object obj)
{ {
if (obj == null)
return false;
if (! (obj instanceof File)) if (! (obj instanceof File))
return false; return false;
...@@ -1006,10 +1003,11 @@ public class File implements Serializable, Comparable ...@@ -1006,10 +1003,11 @@ public class File implements Serializable, Comparable
+ " is not really a directory."); + " is not really a directory.");
} }
// Now process the prefix and suffix. // Check if prefix is at least 3 characters long
if (prefix.length() < 3) if (prefix.length() < 3)
throw new IllegalArgumentException ("Prefix too short: " + prefix); throw new IllegalArgumentException ("Prefix too short: " + prefix);
// Set default value of suffix
if (suffix == null) if (suffix == null)
suffix = ".tmp"; suffix = ".tmp";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment