merge r98531

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

diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
index 0c095004116ccb1b4a4808a73f95fb1047c1a153..08ca7296e59ddc9e257602bcfa24dc03e0d20f4b 100644 (file)
--- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
@@ -664,8 +664,7 @@ namespace System.Web.UI
                        if (control == null)
                                return false;
 
-                       UpdatePanel parent = control.Parent as UpdatePanel;
-                       if (parent != null && parent.RequiresUpdate)
+                       if (control is UpdatePanel && ((UpdatePanel) control).RequiresUpdate)
                                return true;
 
                        return HasBeenRendered (control.Parent);