Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -42,6 +42,7 @@ using System.Xml;
#endif
namespace System.Diagnostics
{
/*
// It handles following elements in <system.diagnostics> :
// - <sharedListeners> [2.0]
// - <sources>
@ -81,6 +82,8 @@ namespace System.Diagnostics
}
}
}
*/
#if (XML_DEP)
[Obsolete ("This class is obsoleted")]
public class DiagnosticsConfigurationHandler : IConfigurationSectionHandler
@ -305,7 +308,7 @@ namespace System.Diagnostics
{
TraceListenerCollection shared_listeners = d ["sharedListeners"] as TraceListenerCollection;
if (shared_listeners == null) {
shared_listeners = new TraceListenerCollection (false);
shared_listeners = new TraceListenerCollection ();
d ["sharedListeners"] = shared_listeners;
}
return shared_listeners;
@ -434,7 +437,8 @@ namespace System.Diagnostics
"Listener '{0}' references a shared " +
"listener and can only have a 'Name' " +
"attribute.", name));
listeners.Add (shared, configValues);
shared.IndentSize = configValues.IndentSize;
listeners.Add (shared);
return;
}
#else
@ -501,7 +505,8 @@ namespace System.Diagnostics
}
#endif
listeners.Add (l, configValues);
l.IndentSize = configValues.IndentSize;
listeners.Add (l);
}
private void RemoveTraceListener (string name)