From 2a2b91f336fe4f6c2a314db2bc4cdffff6cf5a61 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Mon, 13 Nov 2006 00:29:48 +0000 Subject: 2006-11-13 Andrew John Hughes * Merge of HEAD-->generics from 2006/11/04-2006/11/12. --- java/io/OutputStreamWriter.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'java/io/OutputStreamWriter.java') 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()); } /** -- cgit v1.2.1