Backport of r100277mono-1-9-1-p2

svn path=/branches/mono-1-9/mcs/; revision=100279

2 files changed, 7 insertions, 5 deletions

diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
index 9fe98a37374..0a24fa386f1 100644
--- a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
@@ -862,11 +862,7 @@ namespace System.Web.Compilation {
 				foreach (List <AssemblyBuilder> abuilders in assemblyBuilders.Values) {
 					foreach (AssemblyBuilder abuilder in abuilders) {
 						abuilder.AddAssemblyReference (GetReferencedAssemblies () as List <Assembly>);
-						try {
-							results = abuilder.BuildAssembly (virtualPath);
-						} catch (CompilationException ex) {
-							throw new HttpException ("Compilation failed for virtual path '" + virtualPath + "'.", ex);
-						}
+						results = abuilder.BuildAssembly (virtualPath);
 						
 						// No results is not an error - it is possible that the assembly builder contained only .asmx and
 						// .ashx files which had no body, just the directive. In such case, no code unit or code file is added
diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 87c2fc96637..0f6c1d04bec 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-09  Marek Habersack  <mhabersack@novell.com>
+
+	* BuildManager.cs: Do not catch compilation exceptions and wrap them in
+	HttpException, let the CompilationException pass through. Fixes
+	bug #377904
+
 2008-03-13  Marek Habersack  <mhabersack@novell.com>
 
 	* BuildManager.cs: if we're running in a case-insensitive