diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 17:21:23 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 17:21:23 +0000 |
| commit | 0e173b07c7b362109f1f8242667886c7c6ba154f (patch) | |
| tree | 97b99057374663ef41e1ca38792aca28c619853b /libjava | |
| parent | 4e8f82c38fd761bf514ff7be172abea33a9c4344 (diff) | |
| download | ppe42-gcc-0e173b07c7b362109f1f8242667886c7c6ba154f.tar.gz ppe42-gcc-0e173b07c7b362109f1f8242667886c7c6ba154f.zip | |
PR libgcj/16134:
* gnu/gcj/convert/BytesToUnicode.java: Canonicalize encoding name
before cache lookup. Thanks to Hannes Wallnoefer.
* gnu/gcj/convert/UnicodeToBytes.java: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83501 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/BytesToUnicode.java | 3 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/UnicodeToBytes.java | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a08f217de68..40eaea7f4d8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-06-22 Bryce McKinlay <mckinlay@redhat.com> + + PR libgcj/16134: + * gnu/gcj/convert/BytesToUnicode.java: Canonicalize encoding name + before cache lookup. Thanks to Hannes Wallnoefer. + * gnu/gcj/convert/UnicodeToBytes.java: Likewise. + 2004-06-21 Andrew Haley <aph@redhat.com> * java/io/ObjectOutputStream.java: Add DEBUG statements diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java index e7d042baab3..6dc5bfd569d 100644 --- a/libjava/gnu/gcj/convert/BytesToUnicode.java +++ b/libjava/gnu/gcj/convert/BytesToUnicode.java @@ -75,6 +75,7 @@ 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); synchronized (BytesToUnicode.class) { int i; @@ -91,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_" + canonicalize (encoding); + String className = "gnu.gcj.convert.Input_" + encoding; Class decodingClass; try { diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java index 0785d7ea43e..74600ec12c0 100644 --- a/libjava/gnu/gcj/convert/UnicodeToBytes.java +++ b/libjava/gnu/gcj/convert/UnicodeToBytes.java @@ -73,6 +73,7 @@ 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); synchronized (UnicodeToBytes.class) { int i; @@ -88,7 +89,7 @@ public abstract class UnicodeToBytes extends IOConverter } } - String className = "gnu.gcj.convert.Output_" + canonicalize (encoding); + String className = "gnu.gcj.convert.Output_" + encoding; Class encodingClass; try { |
