You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2007/08/01 14:31:19 UTC
svn commit: r561784 -
/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
Author: tellison
Date: Wed Aug 1 05:31:18 2007
New Revision: 561784
URL: http://svn.apache.org/viewvc?view=rev&rev=561784
Log:
Reformatting only.
Modified:
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java?view=diff&rev=561784&r1=561783&r2=561784
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java Wed Aug 1 05:31:18 2007
@@ -115,7 +115,8 @@
private static HashMap<String, CharsetEncoder> cachedCharsetEncoderTable = new HashMap<String, CharsetEncoder>();
private CharsetEncoder cachedEncoder = null;
- private CharsetDecoder cachedDecoder = null;
+
+ private CharsetDecoder cachedDecoder = null;
static {
/*
@@ -401,7 +402,7 @@
systemClassLoader);
cp = c.newInstance();
} catch (SecurityException e) {
- throw e;
+ throw e;
} catch (Exception e) {
throw new Error(e.getMessage(), e);
}
@@ -449,7 +450,7 @@
return cs;
}
// Try built-in charsets
- if(_builtInProvider == null) {
+ if (_builtInProvider == null) {
_builtInProvider = new CharsetProviderImpl();
}
cs = _builtInProvider.charsetForName(charsetName);
@@ -640,7 +641,7 @@
if (cachedEncoder == null) {
cachedEncoder = getCachedCharsetEncoder(canonicalName);
}
-
+
try {
synchronized (cachedEncoder) {
return cachedEncoder.encode(buffer);
@@ -655,8 +656,7 @@
*/
private CharsetEncoder getCachedCharsetEncoder(String name) {
synchronized (cachedCharsetEncoderTable) {
- CharsetEncoder e = cachedCharsetEncoderTable
- .get(name);
+ CharsetEncoder e = cachedCharsetEncoderTable.get(name);
if (null == e) {
e = this.newEncoder();
e.onMalformedInput(CodingErrorAction.REPLACE);
@@ -713,8 +713,7 @@
*/
private CharsetDecoder getCachedCharsetDecoder(String name) {
synchronized (cachedCharsetDecoderTable) {
- CharsetDecoder d = cachedCharsetDecoderTable
- .get(name);
+ CharsetDecoder d = cachedCharsetDecoderTable.get(name);
if (null == d) {
d = this.newDecoder();
d.onMalformedInput(CodingErrorAction.REPLACE);