2009-03-06 Marek Habersack <mhabersack@novell.com>

	* WebControl.cs: if savedState is not an instance of Pair in
	LoadViewState, do not attempt to load from it.

svn path=/trunk/mcs/; revision=128793

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 8c56935ce52edde66e0ecf56d35d0cb67ecc6096..958e4043fe857f8d56e5ebb220f55e8721f184d5 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-06  Marek Habersack  <mhabersack@novell.com>
+
+       * WebControl.cs: if savedState is not an instance of Pair in
+       LoadViewState, do not attempt to load from it.
+
 2009-02-10  Marek Habersack  <mhabersack@novell.com>
 
        * ImageButton.cs: AddAttributesToRender renders the onclick

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
index a3f591718f51a5fe0ff577add3fff7560234111c..cd11067778401be46324ff2f8d986ca8c9b3e620 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -543,7 +543,7 @@ namespace System.Web.UI.WebControls {
 
                protected override void LoadViewState (object savedState) 
                {
-                       if (savedState == null) {
+                       if (savedState == null || !(savedState is Pair)) {
                                base.LoadViewState (null);
                                return;
                        }