diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-13 00:29:48 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-13 00:29:48 +0000 |
| commit | 2a2b91f336fe4f6c2a314db2bc4cdffff6cf5a61 (patch) | |
| tree | 21df1df36e4070dbe32198f06ea33964e82a998b /java/io/OutputStreamWriter.java | |
| parent | 237bdd93058f891ae4567cf4e051c5831bd4646b (diff) | |
| download | classpath-2a2b91f336fe4f6c2a314db2bc4cdffff6cf5a61.tar.gz | |
2006-11-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics from 2006/11/04-2006/11/12.
Diffstat (limited to 'java/io/OutputStreamWriter.java')
| -rw-r--r-- | java/io/OutputStreamWriter.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/io/OutputStreamWriter.java b/java/io/OutputStreamWriter.java index 572683834..26363401f 100644 --- a/java/io/OutputStreamWriter.java +++ b/java/io/OutputStreamWriter.java @@ -223,6 +223,7 @@ public class OutputStreamWriter extends Writer encoder.onMalformedInput(CodingErrorAction.REPLACE); encoder.onUnmappableCharacter(CodingErrorAction.REPLACE); outputBuffer = CharBuffer.allocate(BUFFER_SIZE); + encodingName = EncodingHelper.getOldCanonical(cs.name()); } /** @@ -240,6 +241,11 @@ public class OutputStreamWriter extends Writer this.out = out; encoder = enc; outputBuffer = CharBuffer.allocate(BUFFER_SIZE); + Charset cs = enc.charset(); + if (cs == null) + encodingName = "US-ASCII"; + else + encodingName = EncodingHelper.getOldCanonical(cs.name()); } /** |