reverted 96081

svn path=/branches/mainsoft/gh2.2/mcs/; revision=96485

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 1e7ae26220504a3b45caadf597a29777fda15bc4..733e6a1397f9b1a44a9b946b192d14c300d68066 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * Page.cs: reverted 96081
+
 2008-02-18  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * Page.cs: fixed RegisterRequiresPostBack, performance improvement

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index abf83824c2bae844eeb65676be5e50b47477c549..2acbd6bc6d28bf4bed42fff9892c7f8bb24d1d06 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -1777,10 +1777,10 @@ public partial class Page : TemplateControl, IHttpHandler
                if (_requiresPostBack == null)
                        _requiresPostBack = new ArrayList ();
 
-               if (_requiresPostBack.Contains (control))
+               if (_requiresPostBack.Contains (control.UniqueID))
                        return;
 
-               _requiresPostBack.Add (control);
+               _requiresPostBack.Add (control.UniqueID);
        }
 
        [EditorBrowsable (EditorBrowsableState.Advanced)]
@@ -1888,7 +1888,7 @@ public partial class Page : TemplateControl, IHttpHandler
 #endif
 
                object viewState = SaveViewStateRecursive ();
-               object reqPostback = (_requiresPostBack != null && _requiresPostBack.Count > 0) ? GetRequiresPostBackIds () : null;
+               object reqPostback = (_requiresPostBack != null && _requiresPostBack.Count > 0) ? _requiresPostBack : null;
                Pair vsr = null;
 
                if (viewState != null || reqPostback != null)
@@ -1908,14 +1908,6 @@ public partial class Page : TemplateControl, IHttpHandler
 
        }
 
-       private ArrayList GetRequiresPostBackIds ()
-       {
-               ArrayList a = new ArrayList (_requiresPostBack.Count);
-               for (int i = 0; i < _requiresPostBack.Count; i++)
-                       a.Add (((Control) _requiresPostBack [i]).UniqueID);
-               return a;
-       }
-
        public virtual void Validate ()
        {
                is_validated = true;