Author: mhabersack
Date: 2008-02-08 10:49:02 -0500 (Fri, 08 Feb 2008)
New Revision: 95267
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
Log:
Backport of r95265
Modified: branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
2008-02-08 15:43:19 UTC (rev 95266)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
2008-02-08 15:49:02 UTC (rev 95267)
@@ -1,5 +1,8 @@
2008-02-08 Marek Habersack <[EMAIL PROTECTED]>
+ * SimpleWebHandlerParser.cs: always return a non-null value from
+ the Program property.
+
* TemplateParser.cs: make sure that the Src attribute is treated
correctly in the 2.0 profile. Fixes bug #319016
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
===================================================================
---
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
2008-02-08 15:43:19 UTC (rev 95266)
+++
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
2008-02-08 15:49:02 UTC (rev 95267)
@@ -513,7 +513,12 @@
}
internal string Program {
- get { return program; }
+ get {
+ if (program != null)
+ return program;
+
+ return String.Empty;
+ }
}
internal ArrayList Assemblies {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
