mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
View File

@@ -106,7 +106,12 @@ namespace System.Runtime.Remoting
{
lock (channelTemplates) {
if (!defaultConfigRead) {
ReadConfigFile (Environment.GetMachineConfigPath ());
var bundled = Environment.GetBundledMachineConfig ();
if (bundled != null)
ReadConfigString (bundled);
if (File.Exists (Environment.GetMachineConfigPath ()))
ReadConfigFile (Environment.GetMachineConfigPath ());
defaultConfigRead = true;
}
@@ -121,6 +126,22 @@ namespace System.Runtime.Remoting
Configure (filename, false);
}
private static void ReadConfigString (string filename)
{
try
{
SmallXmlParser parser = new SmallXmlParser ();
using (TextReader rreader = new StringReader (filename)) {
ConfigHandler handler = new ConfigHandler (false);
parser.Parse (rreader, handler);
}
}
catch (Exception ex)
{
throw new RemotingException ("Configuration string could not be loaded: " + ex.Message, ex);
}
}
private static void ReadConfigFile (string filename)
{
try