refactoring:

call SetupResponseWriter before render phase.

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

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index 1425f6f2ea62045b6889b6baf8fec37e6179c610..f7e9a9d7a22ee9f9e8f5ef857c1da370657bd658 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -1580,10 +1580,6 @@ public partial class Page : TemplateControl, IHttpHandler
                //--
                Trace.Write ("aspx.page", "Begin Render");
                HtmlTextWriter output = new HtmlTextWriter (Response.Output);
-#if TARGET_J2EE
-               if (getFacesContext () != null)
-                       SetupResponseWriter (output);
-#endif
                RenderControl (output);
                Trace.Write ("aspx.page", "End Render");
        }

diff --git a/mcs/class/System.Web/System.Web.UI/Page.jvm.cs b/mcs/class/System.Web/System.Web.UI/Page.jvm.cs
index 5f57c237a40cac36eb8a705db3109f848b932d77..39a297c43dee1c105708d343068c19ab2f0a8135 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Page.jvm.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.jvm.cs
@@ -61,7 +61,6 @@ namespace System.Web.UI
                FacesContext _facesContext;\r
 \r
                static readonly java.util.List emptyList = java.util.Collections.unmodifiableList (new java.util.ArrayList ());\r
-               static readonly RenderKitFactory renderFactory = (RenderKitFactory) FactoryFinder.getFactory (FactoryFinder.RENDER_KIT_FACTORY);\r
 \r
                bool _isMultiForm = false;\r
                bool _isMultiFormInited = false;\r
@@ -366,19 +365,11 @@ namespace System.Web.UI
                        FacesContext facesContext = getFacesContext ();\r
 \r
                        ResponseWriter oldWriter = facesContext.getResponseWriter ();\r
-                       ResponseWriter writer;\r
-                       if (oldWriter != null) {\r
-                               writer = oldWriter.cloneWithWriter (new AspNetResponseWriter (httpWriter));\r
-                       }\r
-                       else {\r
-                               RenderKit renderKit = renderFactory.getRenderKit (facesContext, facesContext.getViewRoot ().getRenderKitId ());\r
-\r
-                               ServletResponse response = (ServletResponse) facesContext.getExternalContext ().getResponse ();\r
+                       if (oldWriter == null)\r
+                               throw new InvalidOperationException ();\r
 \r
-                               writer = renderKit.createResponseWriter (new AspNetResponseWriter (httpWriter),\r
-                                                                                                                response.getContentType (), //TODO: is this the correct content type?\r
-                                                                                                                response.getCharacterEncoding ());\r
-                       }\r
+                       ResponseWriter writer = oldWriter.cloneWithWriter (new AspNetResponseWriter (httpWriter));\r
+                       \r
                        facesContext.setResponseWriter (writer);\r
                        return oldWriter;\r
                }\r