Charset.java (encode, decode): Synchronize on 'this', not the class.

	* java/nio/charset/Charset.java (encode, decode): Synchronize on
	'this', not the class.

From-SVN: r99810

libjava/ChangeLog

 2005-05-16  Tom Tromey  <tromey@redhat.com>
 
+	* java/nio/charset/Charset.java (encode, decode): Synchronize on
+	'this', not the class.
+
+2005-05-16  Tom Tromey  <tromey@redhat.com>
+
 	* gnu/java/net/protocol/http/Headers.java (parse): Include final
 	character of line.
 

libjava/java/nio/charset/Charset.java

@@ -289,15 +289,13 @@ public abstract class Charset implements Comparable
     return true;
   }
 
-  public final ByteBuffer encode (CharBuffer cb)
-  {
-    try
-      {
   // NB: This implementation serializes different threads calling
   // Charset.encode(), a potential performance problem.  It might
   // be better to remove the cache, or use ThreadLocal to cache on
   // a per-thread basis.
-        synchronized (Charset.class)
+  public final synchronized ByteBuffer encode (CharBuffer cb)
+  {
+    try
       {
 	if (cachedEncoder == null)
 	  {
@@ -308,7 +306,6 @@ public abstract class Charset implements Comparable
 	  cachedEncoder.reset();
 	return cachedEncoder.encode (cb);
       }
-      }
     catch (CharacterCodingException e)
       {
         throw new AssertionError (e);
@@ -320,15 +317,13 @@ public abstract class Charset implements Comparable
     return encode (CharBuffer.wrap (str));
   }
 
-  public final CharBuffer decode (ByteBuffer bb)
-  {
-    try
-      {
   // NB: This implementation serializes different threads calling
   // Charset.decode(), a potential performance problem.  It might
   // be better to remove the cache, or use ThreadLocal to cache on
   // a per-thread basis.
-        synchronized (Charset.class)
+  public final synchronized CharBuffer decode (ByteBuffer bb)
+  {
+    try
       {
 	if (cachedDecoder == null)
 	  {
@@ -340,7 +335,6 @@ public abstract class Charset implements Comparable
 
 	return cachedDecoder.decode (bb);
       }
-      }
     catch (CharacterCodingException e)
       {
         throw new AssertionError (e);