diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2008-07-16 17:59:06 +0400 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2008-07-16 17:59:06 +0400 |
| commit | e83157f0bf312d6eb0f1d96e906357d4c006278b (patch) | |
| tree | 69d18bbbd2f113b2cf16a457f5b902b806ee2915 | |
| parent | 6bc712404f0cc0f6de5c03542686bd709a038dfa (diff) | |
Backport of r108024
svn path=/branches/mono-2-0/mcs/; revision=108030
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index 8b513f45d68..b0eac139fe7 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,3 +1,8 @@ +2008-07-16 Marek Habersack <mhabersack@novell.com> + + * XmlDataSource.cs: check if Page isn't null before stringifying + it in GetDataKey (), fixes bug #409492 + 2008-07-13 Roei Erez <roeie@mainsoft.com> * GridView.cs: When the RowDataBound event is invoked, the value diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs index 70f44c07658..425041aaeea 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs @@ -140,7 +140,10 @@ namespace System.Web.UI.WebControls { string GetDataKey () { - return TemplateSourceDirectory + "_" + Page.ToString () + "_" + ID; + Page page = Page; + string p = page != null ? page.ToString () : "NullPage"; + + return TemplateSourceDirectory + "_" + p + "_" + ID; } Cache DataCache |