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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a08f217..40eaea7 100644 (file)
--- 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 e7d042b..6dc5bfd 100644 (file)
--- 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 0785d7e..74600ec 100644 (file)
--- 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 
       {