From f356e9625451fbd2eca5b252dba9fcf13f1144ec Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 22 Oct 2003 08:47:12 +0000 Subject: 2003-10-22 Michael Koch * java/io/File.java (equals): Removed redundant obj == null check. (createTempFile): Merged comments from classpath. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72790 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/File.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 4800ba15c18..b4951ecc806 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -111,7 +111,7 @@ public class File implements Serializable, Comparable * is taken from the path.separator 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"; -- cgit v1.2.3