OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2005-05-17 01:52:02 +00:00 committed by Tom Tromey
parent e5b58ee301
commit 9d9bd40fb6
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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

58
libjava/java/nio/charset/Charset.java
View File

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