Repository: reef Updated Branches: refs/heads/master 0ab1c2729 -> c26901fc4
[REEF-1524] Fix .NET Core System.Text.Encoding.get_Default incompatibility in Tang JIRA: [REEF-1524](https://issues.apache.org/jira/browse/REEF-1524) Pull request: This closes #1094 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/c26901fc Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/c26901fc Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/c26901fc Branch: refs/heads/master Commit: c26901fc41f2b7af03df03693b673f78eeb19ab5 Parents: 0ab1c27 Author: inchiosa <[email protected]> Authored: Thu Aug 11 14:52:45 2016 -0700 Committer: Mariia Mykhailova <[email protected]> Committed: Fri Aug 12 18:11:04 2016 -0700 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/c26901fc/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs index 39f6992..01a20c8 100644 --- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs +++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs @@ -144,7 +144,7 @@ namespace Org.Apache.REEF.Tang.Formats public static IConfiguration GetConfiguration(string configString) { - byte[] array = Encoding.Default.GetBytes(configString); + byte[] array = Encoding.GetEncoding(0).GetBytes(configString); return GetConfiguration(array); } @@ -157,7 +157,7 @@ namespace Org.Apache.REEF.Tang.Formats public static void AddConfigurationFromStream(IConfigurationBuilder conf, byte[] configData) { - using (StreamReader reader = new StreamReader(new MemoryStream(configData), Encoding.Default)) + using (StreamReader reader = new StreamReader(new MemoryStream(configData), Encoding.GetEncoding(0))) { AddConfiguration(conf, reader); }
