Преглед изворни кода

2005-06-25 Gonzalo Paniagua Javier <[email protected]>

	* CachingCompiler.cs: use cache.InsertPrivate.
	* AspGenerator.cs: use cache.InsertPrivate. Removed extra call to
	AddDependency.


svn path=/trunk/mcs/; revision=46508
Gonzalo Paniagua Javier пре 20 година
родитељ
комит
4886fe7a8d

+ 1 - 2
mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs

@@ -187,7 +187,6 @@ namespace System.Web.Compilation
 		public AspGenerator (TemplateParser tparser)
 		{
 			this.tparser = tparser;
-			tparser.AddDependency (tparser.InputFile);
 			text = new StringBuilder ();
 			stack = new BuilderLocationStack ();
 			rootBuilder = new RootBuilder (tparser);
@@ -270,7 +269,7 @@ namespace System.Web.Compilation
 			CacheDependency cd = new CacheDependency ((string[])
 							tparser.Dependencies.ToArray (typeof (string)));
 
-			HttpRuntime.Cache.Insert ("@@Type" + tparser.InputFile, type, cd);
+			HttpRuntime.Cache.InsertPrivate ("@@Type" + tparser.InputFile, type, cd);
 			return type;
 		}
 

+ 4 - 4
mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs

@@ -51,7 +51,7 @@ namespace System.Web.Compilation
 		{
 			string [] cacheKeys = new string [] { cachePrefix + filename };
 			CacheDependency dep = new CacheDependency (null, cacheKeys);
-			HttpRuntime.Cache.Insert (cacheTypePrefix + filename, type, dep);
+			HttpRuntime.Cache.InsertPrivate (cacheTypePrefix + filename, type, dep);
 		}
 
 		public static Type GetTypeFromCache (string filename)
@@ -75,7 +75,7 @@ namespace System.Web.Compilation
 				ICodeCompiler comp = compiler.Compiler;
 				results = comp.CompileAssemblyFromDom (compiler.CompilerParameters, compiler.Unit);
 				string [] deps = (string []) compiler.Parser.Dependencies.ToArray (typeof (string));
-				cache.Insert (key, results, new CacheDependency (deps));
+				cache.InsertPrivate (key, results, new CacheDependency (deps));
 			}
 
 			return results;
@@ -99,7 +99,7 @@ namespace System.Web.Compilation
 				options.IncludeDebugInformation = parser.Debug;
 				results = compiler.Compiler.CompileAssemblyFromFile (options, compiler.InputFile);
 				string [] deps = (string []) parser.Dependencies.ToArray (typeof (string));
-				cache.Insert (key, results, new CacheDependency (deps));
+				cache.InsertPrivate (key, results, new CacheDependency (deps));
 			}
 
 			return results;
@@ -155,7 +155,7 @@ namespace System.Web.Compilation
 				}
 
 				string [] deps = (string []) realdeps.ToArray (typeof (string));
-				cache.Insert (cachePrefix + key, results, new CacheDependency (deps));
+				cache.InsertPrivate (cachePrefix + key, results, new CacheDependency (deps));
 			}
 
 			return results;

+ 6 - 0
mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,9 @@
+2005-06-25 Gonzalo Paniagua Javier <[email protected]>
+
+	* CachingCompiler.cs: use cache.InsertPrivate.
+	* AspGenerator.cs: use cache.InsertPrivate. Removed extra call to
+	AddDependency.
+
 2005-06-24 Gonzalo Paniagua Javier <[email protected]>
 
 	* CachingCompiler.cs: create the assemly in the DynamicBase directory,