2009-06-25 Gonzalo Paniagua Javier <gonzalo@novell.com>

* BuildManager.cs: backport r131138. svn path=/branches/mono-2-4-2/mcs/; revision=136882
alanmcgovern · Jun 25, 2009 · 8a7c716 · 8a7c716
1 parent 01bbe61
commit 8a7c716
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
@@ -594,7 +594,7 @@ static BuildCacheItem GetCachedItem (VirtualPath virtualPath)
 		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
@@ -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