diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/nio/charset/Charset.java | 58 |
2 files changed, 31 insertions, 32 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c6295096631..9c9e466603e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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. diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java index d52fc9c7d21..8c6286db9ca 100644 --- a/libjava/java/nio/charset/Charset.java +++ b/libjava/java/nio/charset/Charset.java @@ -289,25 +289,22 @@ public abstract class Charset implements Comparable return true; } - public final ByteBuffer encode (CharBuffer cb) + // 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. + public final synchronized 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) - { - if (cachedEncoder == null) - { - cachedEncoder = newEncoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedEncoder.reset(); - return cachedEncoder.encode (cb); - } + if (cachedEncoder == null) + { + cachedEncoder = newEncoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedEncoder.reset(); + return cachedEncoder.encode (cb); } catch (CharacterCodingException e) { @@ -320,26 +317,23 @@ public abstract class Charset implements Comparable return encode (CharBuffer.wrap (str)); } - public final CharBuffer decode (ByteBuffer bb) + // 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. + public final synchronized 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) - { - if (cachedDecoder == null) - { - cachedDecoder = newDecoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedDecoder.reset(); + if (cachedDecoder == null) + { + cachedDecoder = newDecoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedDecoder.reset(); - return cachedDecoder.decode (bb); - } + return cachedDecoder.decode (bb); } catch (CharacterCodingException e) { |