diff options
author | Jan Kotas <jkotas@microsoft.com> | 2015-08-03 11:24:37 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-03 11:24:37 -0700 |
commit | af0b3115d7be94edbd1ee3fe2adcabdd8eaa87dd (patch) | |
tree | 297108bbec54ebeb38a187d240ab1b005fbc8937 | |
parent | 75cf9b44e002d0cac60792e264c2ecd629d77308 (diff) | |
parent | 9b174d4843900a2267e46fb2acb11f3cb0b56f3a (diff) | |
download | coreclr-af0b3115d7be94edbd1ee3fe2adcabdd8eaa87dd.tar.gz coreclr-af0b3115d7be94edbd1ee3fe2adcabdd8eaa87dd.tar.bz2 coreclr-af0b3115d7be94edbd1ee3fe2adcabdd8eaa87dd.zip |
Merge pull request #1331 from justinvp/streamreader_cachedencodings
StreamReader: Use the static cached Encoding instances
-rw-r--r-- | src/mscorlib/src/System/IO/StreamReader.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mscorlib/src/System/IO/StreamReader.cs b/src/mscorlib/src/System/IO/StreamReader.cs index 2bae983709..82104bbfa6 100644 --- a/src/mscorlib/src/System/IO/StreamReader.cs +++ b/src/mscorlib/src/System/IO/StreamReader.cs @@ -451,7 +451,7 @@ namespace System.IO if (byteBuffer[0]==0xFE && byteBuffer[1]==0xFF) { // Big Endian Unicode - encoding = new UnicodeEncoding(true, true); + encoding = Encoding.BigEndianUnicode; CompressBuffer(2); changedEncoding = true; } @@ -459,13 +459,13 @@ namespace System.IO else if (byteBuffer[0]==0xFF && byteBuffer[1]==0xFE) { // Little Endian Unicode, or possibly little endian UTF32 if (byteLen < 4 || byteBuffer[2] != 0 || byteBuffer[3] != 0) { - encoding = new UnicodeEncoding(false, true); + encoding = Encoding.Unicode; CompressBuffer(2); changedEncoding = true; } #if FEATURE_UTF32 else { - encoding = new UTF32Encoding(false, true); + encoding = Encoding.UTF32; CompressBuffer(4); changedEncoding = true; } |