diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2009-06-26 00:30:08 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2009-06-26 00:30:08 +0400 |
| commit | 8a7c716e20f2aeadbe827b5d532fe36f69e74568 (patch) | |
| tree | 342faaf97b4cc4eec8878afa8372590309e5ad98 | |
| parent | 01bbe61085220e441170e93e38c87368cf6726f1 (diff) | |
2009-06-25 Gonzalo Paniagua Javier <gonzalo@novell.com>mono-2.4.2mono-2-4-2-rc2
* BuildManager.cs: backport r131138.
svn path=/branches/mono-2-4-2/mcs/; revision=136882
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/BuildManager.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/ChangeLog | 4 |
2 files changed, 5 insertions, 1 deletions
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 <gonzalo@novell.com> + + * BuildManager.cs: backport r131138. + 2009-06-15 Marek Habersack <mhabersack@novell.com> * AspGenerator.cs: CreateRootBuilder quits when root builder |