diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-11 16:27:35 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-11 16:27:35 +0000 |
| commit | be53c22610fc94928988e1d05b77ba7715b6b3a4 (patch) | |
| tree | 8efc5eb1f498f3452d0710f2c237f22583c6c2c0 | |
| parent | 40d84fe34fd7b856097120319c0b83af0b7c1374 (diff) | |
| download | gcc-be53c22610fc94928988e1d05b77ba7715b6b3a4.tar.gz | |
2004-03-11 Michael Koch <konqueror@gmx.de>
* java/util/Locale.java
(getISO3Language): Use String.equals() instead of ==.
(getISO3Country): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79330 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/util/Locale.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2d741cf4468..b92efd4c400 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-03-11 Michael Koch <konqueror@gmx.de> + + * java/util/Locale.java + (getISO3Language): Use String.equals() instead of ==. + (getISO3Country): Likewise. + 2004-03-11 Dalibor Topic <robilad@kaffe.org> * java/text/AttributedString.java diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java index 06867fb020c..c77f0cb9284 100644 --- a/libjava/java/util/Locale.java +++ b/libjava/java/util/Locale.java @@ -436,7 +436,7 @@ public final class Locale implements Serializable, Cloneable */ public String getISO3Language() { - if (language == "") + if (language.equals("")) return ""; int index = ("aa,ab,af,am,ar,as,ay,az,ba,be,bg,bh,bi,bn,bo,br,ca,co,cs,cy,da," @@ -472,7 +472,7 @@ public final class Locale implements Serializable, Cloneable */ public String getISO3Country() { - if (country == "") + if (country.equals("")) return ""; int index = ("AD,AE,AF,AG,AI,AL,AM,AN,AO,AQ,AR,AS,AT,AU,AW,AZ,BA,BB,BD,BE,BF," |