Author: mhabersack
Date: 2007-09-04 16:28:25 -0400 (Tue, 04 Sep 2007)
New Revision: 85322
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
Log:
2007-09-04 Marek Habersack <[EMAIL PROTECTED]>
* TemplateParser.cs: don't optimize for case when 'name' is a full
assembly name in AddAssemblyByName. Assembly.Load triggers the
AssemblyResolve event on the current AppDomain if an assembly
isn't found and we use this mechanism to map names like "App_Code"
or "App_GlobalResources" to the real names of those dynamic
assemblies.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-09-04 19:40:20 UTC
(rev 85321)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-09-04 20:28:25 UTC
(rev 85322)
@@ -1,3 +1,12 @@
+2007-09-04 Marek Habersack <[EMAIL PROTECTED]>
+
+ * TemplateParser.cs: don't optimize for case when 'name' is a full
+ assembly name in AddAssemblyByName. Assembly.Load triggers the
+ AssemblyResolve event on the current AppDomain if an assembly
+ isn't found and we use this mechanism to map names like "App_Code"
+ or "App_GlobalResources" to the real names of those dynamic
+ assemblies.
+
2007-09-02 Igor Zelmanovich <[EMAIL PROTECTED]>
* Page.jvm.cs: implemented IsMultiForm property to take
Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs 2007-09-04
19:40:20 UTC (rev 85321)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs 2007-09-04
20:28:25 UTC (rev 85322)
@@ -487,11 +487,9 @@
Assembly assembly = null;
Exception error = null;
- if (name.IndexOf (',') != -1) {
- try {
- assembly = Assembly.Load (name);
- } catch (Exception e) { error = e; }
- }
+ try {
+ assembly = Assembly.Load (name);
+ } catch (Exception e) { error = e; }
if (assembly == null) {
try {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
