X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web.Extensions%2FSystem.Web.Handlers%2FScriptModule.cs;h=bf4bad4bfce183594ff96e3cfc37abf1a5a50c2a;hb=4323fbeaebf249f016dfdd6dc9b3b52a515f87c4;hp=cc2b0c97982846a4402fb764b9c829bcbd2fd678;hpb=8ccff51429c23026db64d2067fd38830ed03d967;p=mono.git

diff --git a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
index cc2b0c97982..bf4bad4bfce 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
@@ -87,6 +87,10 @@ namespace System.Web.Handlers
 			HttpContext context = app.Context;
 			if (context.Request.Headers ["X-MicrosoftAjax"] == "Delta=true") {
 				Page p = context.CurrentHandler as Page;
+#if TARGET_J2EE
+				if (p == null && context.CurrentHandler is IServiceProvider)
+					p = (Page) ((IServiceProvider) context.CurrentHandler).GetService (typeof (Page));
+#endif
 				if (p == null)
 					return;
 				ScriptManager sm = ScriptManager.GetCurrent (p);