2003-06-18 Michael Koch <konqueror@gmx.de>

* java/util/Locale.java
	(equals): Merged from classpath.

From-SVN: r68144
This commit is contained in:
Michael Koch 2003-06-18 08:15:42 +00:00 committed by Michael Koch
parent 75da2103e4
commit 20d513ff66
2 changed files with 8 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2003-06-18 Michael Koch <konqueror@gmx.de>
* java/util/Locale.java
(equals): Merged from classpath.
2003-06-18 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java:

View File

@ -723,9 +723,12 @@ public final class Locale implements Serializable, Cloneable
*/
public boolean equals(Object obj)
{
if (this == obj)
return true;
if (! (obj instanceof Locale))
return false;
Locale l = (Locale) obj;
return (language.equals(l.language)
&& country.equals(l.country)
&& variant.equals(l.variant));