Imported Upstream version 4.4.0.122

Former-commit-id: a99f46acaeba3ab496c7afc02c29b839e30a0d0b
2016-04-12 13:19:31 -04:00
parent a632333cc7
commit d444f0caa4
118 changed files with 4121 additions and 1632 deletions
--- a/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
+++ b/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
@@ -255,10 +255,10 @@ namespace System.Diagnostics {
 				WritePrefix ();
 			}

-			WriteDebugString (message);
-
 			if (Debugger.IsLogging())
 				Debugger.Log (0, null, message);
+			else
+				WriteDebugString (message);

 			WriteLogFile (message, LogFileName);
 		}