OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Arrays.java (equals(all variants)): Quit using NullPointerException catching to detect null valued parameters.

Browse Source 
2003-09-10  David Daney <ddaney@avtrex.com>

	* java/util/Arrays.java (equals(all variants)): Quit using
	NullPointerException catching to detect null valued parameters.

From-SVN: r71275
This commit is contained in:
David Daney 2003-09-10 18:11:05 +00:00 committed by Tom Tromey
parent 4a503716e0
commit 9c9d2cced9
2 changed files with 96 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-10 David Daney <ddaney@avtrex.com>
* java/util/Arrays.java (equals(all variants)): Quit using
NullPointerException catching to detect null valued parameters.
2003-09-10 Michael Koch <konqueror@gmx.de> 2003-09-10 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java, * java/net/DatagramSocket.java,

219
libjava/java/util/Arrays.java
View File

@ -1,5 +1,5 @@
/* Arrays.java -- Utility class with methods to operate on arrays /* Arrays.java -- Utility class with methods to operate on arrays
Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -398,23 +398,18 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
} }
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
}
return false; return false;
} }
@ -433,21 +428,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -467,21 +458,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -501,21 +488,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -535,21 +518,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -569,21 +548,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (a1[i] != a2[i])
int i = a1.length; return false;
while (--i >= 0) return true;
if (a1[i] != a2[i])
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -603,22 +578,18 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
if (null == a1 || null == a2)
return false;
// Must use Float.compare to take into account NaN, +-0. // Must use Float.compare to take into account NaN, +-0.
try // If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (Float.compare(a1[i], a2[i]) != 0)
int i = a1.length; return false;
while (--i >= 0) return true;
if (Float.compare(a1[i], a2[i]) != 0)
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -638,22 +609,18 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
if (null == a1 || null == a2)
return false;
// Must use Double.compare to take into account NaN, +-0. // Must use Double.compare to take into account NaN, +-0.
try // If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (Double.compare(a1[i], a2[i]) != 0)
int i = a1.length; return false;
while (--i >= 0) return true;
if (Double.compare(a1[i], a2[i]) != 0)
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }
@ -674,21 +641,17 @@ public class Arrays
if (a1 == a2) if (a1 == a2)
return true; return true;
try if (null == a1 || null == a2)
return false;
// If they're the same length, test each element
if (a1.length == a2.length)
{ {
// If they're the same length, test each element int i = a1.length;
if (a1.length == a2.length) while (--i >= 0)
{ if (! AbstractCollection.equals(a1[i], a2[i]))
int i = a1.length; return false;
while (--i >= 0) return true;
if (! AbstractCollection.equals(a1[i], a2[i]))
return false;
return true;
}
}
catch (NullPointerException e)
{
// If one is null, we get a harmless NullPointerException
} }
return false; return false;
} }