diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 19:24:32 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 19:24:32 +0000 |
| commit | 10e7211afae9cc017a9c73b3d1ced928e2b49bc7 (patch) | |
| tree | 514e0f3de83f6d83c27fafa56c44486ed2628748 /libjava | |
| parent | a6f612a134c079b92f1f610c36ff32c497180e96 (diff) | |
| download | ppe42-gcc-10e7211afae9cc017a9c73b3d1ced928e2b49bc7.tar.gz ppe42-gcc-10e7211afae9cc017a9c73b3d1ced928e2b49bc7.zip | |
* gnu/gcj/convert/BytesToUnicode.java (getDecoder): Pass original
encoding name to iconv.
* gnu/gcj/convert/UnicodeToBytes.java (getEncoder): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83512 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/BytesToUnicode.java | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/UnicodeToBytes.java | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d61b10c4adb..a0a8fda37cc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2004-06-22 Bryce McKinlay <mckinlay@redhat.com> + * gnu/gcj/convert/BytesToUnicode.java (getDecoder): Pass original + encoding name to iconv. + * gnu/gcj/convert/UnicodeToBytes.java (getEncoder): Likewise. + +2004-06-22 Bryce McKinlay <mckinlay@redhat.com> + PR libgcj/16134: * gnu/gcj/convert/BytesToUnicode.java (getDecoder): Canonicalize encoding name before cache lookup. Thanks to Hannes Wallnoefer. diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java index 6dc5bfd569d..f33720aa227 100644 --- a/libjava/gnu/gcj/convert/BytesToUnicode.java +++ b/libjava/gnu/gcj/convert/BytesToUnicode.java @@ -75,14 +75,14 @@ public abstract class BytesToUnicode extends IOConverter { /* First hunt in our cache to see if we have a decoder that is already allocated. */ - encoding = canonicalize(encoding); + String canonicalEncoding = canonicalize(encoding); synchronized (BytesToUnicode.class) { int i; for (i = 0; i < decoderCache.length; ++i) { if (decoderCache[i] != null - && encoding.equals(decoderCache[i].getName ())) + && canonicalEncoding.equals(decoderCache[i].getName ())) { BytesToUnicode rv = decoderCache[i]; decoderCache[i] = null; @@ -92,7 +92,7 @@ public abstract class BytesToUnicode extends IOConverter } // It's not in the cache, so now we have to do real work. - String className = "gnu.gcj.convert.Input_" + encoding; + String className = "gnu.gcj.convert.Input_" + canonicalEncoding; Class decodingClass; try { diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java index 74600ec12c0..b1432586ce5 100644 --- a/libjava/gnu/gcj/convert/UnicodeToBytes.java +++ b/libjava/gnu/gcj/convert/UnicodeToBytes.java @@ -73,14 +73,14 @@ public abstract class UnicodeToBytes extends IOConverter { /* First hunt in our cache to see if we have a encoder that is already allocated. */ - encoding = canonicalize(encoding); + String canonicalEncoding = canonicalize(encoding); synchronized (UnicodeToBytes.class) { int i; for (i = 0; i < encoderCache.length; ++i) { if (encoderCache[i] != null - && encoding.equals(encoderCache[i].getName ())) + && canonicalEncoding.equals(encoderCache[i].getName ())) { UnicodeToBytes rv = encoderCache[i]; encoderCache[i] = null; @@ -89,7 +89,7 @@ public abstract class UnicodeToBytes extends IOConverter } } - String className = "gnu.gcj.convert.Output_" + encoding; + String className = "gnu.gcj.convert.Output_" + canonicalEncoding; Class encodingClass; try { |
