Imported Upstream version 4.2.0.207

Former-commit-id: 375ae9d61af40de28f42f70de9ef72dfd911b55b
This commit is contained in:
Xamarin Public Jenkins
2015-09-02 12:36:57 -04:00
committed by Jo Shields
parent ccbfd4fe01
commit 193abcaedc
53 changed files with 992 additions and 170 deletions

View File

@@ -199,7 +199,7 @@ namespace System
/* Not thrown yet */
return null;
StackTrace st = new StackTrace (this, 0, true, true);
StackTrace st = new StackTrace (this, 0, true);
return stack_trace = st.ToString ();
}
}
@@ -298,6 +298,7 @@ namespace System
{
captured_traces = (StackTrace[]) exceptionDispatchInfo.BinaryStackTraceArray;
trace_ips = null;
stack_trace = null;
}
//