Author: gonzalo
Date: 2005-06-25 16:47:41 -0400 (Sat, 25 Jun 2005)
New Revision: 46508
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
2005-06-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* CachingCompiler.cs: use cache.InsertPrivate.
* AspGenerator.cs: use cache.InsertPrivate. Removed extra call to
AddDependency.
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2005-06-25 20:46:31 UTC (rev 46507)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2005-06-25 20:47:41 UTC (rev 46508)
@@ -187,7 +187,6 @@
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 @@
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;
}
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
2005-06-25 20:46:31 UTC (rev 46507)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
2005-06-25 20:47:41 UTC (rev 46508)
@@ -51,7 +51,7 @@
{
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 @@
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 @@
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 @@
}
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;
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-06-25
20:46:31 UTC (rev 46507)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-06-25
20:47:41 UTC (rev 46508)
@@ -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,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches