From 8a7c716e20f2aeadbe827b5d532fe36f69e74568 Mon Sep 17 00:00:00 2001 From: Gonzalo Paniagua Javier Date: Thu, 25 Jun 2009 20:30:08 +0000 Subject: 2009-06-25 Gonzalo Paniagua Javier * BuildManager.cs: backport r131138. svn path=/branches/mono-2-4-2/mcs/; revision=136882 --- mcs/class/System.Web/System.Web.Compilation/BuildManager.cs | 2 +- mcs/class/System.Web/System.Web.Compilation/ChangeLog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs index 0a5d28ec9ae..a0d5f771662 100644 --- a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs +++ b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs @@ -594,7 +594,7 @@ namespace System.Web.Compilation { static Type GetPrecompiledType (string virtualPath) { PreCompilationData pc_data; - if (precompiled.TryGetValue (virtualPath, out pc_data)) { + if (precompiled != null && precompiled.TryGetValue (virtualPath, out pc_data)) { if (pc_data.Type == null) { pc_data.Type = Type.GetType (pc_data.TypeName + ", " + pc_data.AssemblyFileName, true); } diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog index 05292da339e..64465baa48e 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog +++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog @@ -1,3 +1,7 @@ +2009-06-25 Gonzalo Paniagua Javier + + * BuildManager.cs: backport r131138. + 2009-06-15 Marek Habersack * AspGenerator.cs: CreateRootBuilder quits when root builder -- cgit v1.2.3