re PR libgcj/16134 (Memory leak in String.getBytes())

PR libgcj/16134:
	* gnu/gcj/convert/BytesToUnicode.java: Canonicalize encoding name
	before cache lookup. Thanks to Hannes Wallnoefer.
	* gnu/gcj/convert/UnicodeToBytes.java: Likewise.

From-SVN: r83501
This commit is contained in:
Bryce McKinlay 2004-06-22 17:21:23 +00:00 committed by Bryce McKinlay
parent 3b56276ea5
commit f50aa5059a
3 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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
{

View File

@ -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
{