diff options
author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-08-22 23:39:30 +0400 |
---|---|---|
committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-08-22 23:39:30 +0400 |
commit | 1046f8157f281be5e7e504589ca9afe3d8e24020 (patch) | |
tree | 0aa16bb7119a4016fde95d18c01c08b88ab8b815 | |
parent | f18522243d576068a0f72b4192fb48984f6cb894 (diff) |
2005-08-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* CSharpCodeCompiler.cs: patch from Maksim Vorobiev that prevents
InvalidOperationException if the thread running mcs is aborted.
svn path=/trunk/mcs/; revision=48688
-rw-r--r-- | mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Microsoft.CSharp/ChangeLog | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs index 2e788893d57..0339ef48d40 100644 --- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs +++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs @@ -173,8 +173,8 @@ namespace Mono.CSharp mcs_output=mcs.StandardError.ReadToEnd(); mcs.StandardOutput.ReadToEnd (); mcs.WaitForExit(); - } finally { results.NativeCompilerReturnValue = mcs.ExitCode; + } finally { mcs.Close(); } mcs_output_lines=mcs_output.Split( diff --git a/mcs/class/System/Microsoft.CSharp/ChangeLog b/mcs/class/System/Microsoft.CSharp/ChangeLog index 18a93c1b31a..d96324fd958 100644 --- a/mcs/class/System/Microsoft.CSharp/ChangeLog +++ b/mcs/class/System/Microsoft.CSharp/ChangeLog @@ -1,3 +1,8 @@ +2005-08-22 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * CSharpCodeCompiler.cs: patch from Maksim Vorobiev that prevents + InvalidOperationException if the thread running mcs is aborted. + 2005-08-20 Gonzalo Paniagua Javier <gonzalo@ximian.com> * CSharpCodeCompiler.cs: made the colon optional so that both mcs and |