Added J2EE Portal support.

[mono.git] / mcs / class / Mainsoft.Web / Mainsoft.Web.Hosting / ServletWorkerRequest.jvm.cs

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.jvm.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.jvm.cs
index 469e44ae5b5ab0ea522c5b5a480261863978b228..0fb1d32369734cead814777e06c4d9a05959a09d 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.jvm.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.jvm.cs
@@ -27,7 +27,6 @@ using System.IO;
 using System.Text;
 using System.Runtime.InteropServices;
 using System.Web.Util;
-using vmw.common;
 using System.Web.J2EE;
 using System.Collections;
 using System.Web;
@@ -36,14 +35,17 @@ using javax.servlet.http;
 using System.Collections.Specialized;
 using System.Globalization;
 using System.Web.Hosting;
+using vmw.common;
+using vmw.@internal.j2ee;
 
 namespace Mainsoft.Web.Hosting {
        [MonoTODO("Implement security demands on the path usage functions (and review)")]
        [ComVisible (false)]
-       internal sealed class ServletWorkerRequest : HttpWorkerRequest {
+       internal sealed class ServletWorkerRequest : HttpWorkerRequest, IServiceProvider {
                readonly HttpServlet _HttpServlet;
                readonly HttpServletRequest _HttpServletRequest;
                readonly HttpServletResponse _HttpServletResponse;
+               java.io.OutputStream _OutputStream;
 
                readonly string _requestUri;
                readonly string _pathInfo;
@@ -93,10 +95,11 @@ namespace Mainsoft.Web.Hosting {
                                KnownServerVariableMap[knownServerVariableNames[i]] = (KnownServerVariable)i;
                }
 
-               public ServletWorkerRequest (HttpServlet servlet, HttpServletRequest req, HttpServletResponse resp) {
+               public ServletWorkerRequest (HttpServlet servlet, HttpServletRequest req, HttpServletResponse resp, java.io.OutputStream outputStream) {
                        _HttpServlet = servlet;
                        _HttpServletRequest = req;
                        _HttpServletResponse = resp;
+                       _OutputStream = outputStream;
 
                        string contextPath = req.getContextPath();
                        string requestURI = req.getRequestURI();
@@ -119,6 +122,17 @@ namespace Mainsoft.Web.Hosting {
                        }
                }
 
+               public object GetService (Type serviceType)
+               {
+                       if (serviceType == typeof(HttpServlet))
+                               return Servlet;
+                       if (serviceType == typeof(HttpServletRequest))
+                               return ServletRequest;
+                       if (serviceType == typeof(HttpServletResponse))
+                               return ServletResponse;
+                       return null;
+               }
+
                public HttpServlet Servlet {
                        get {
                                return _HttpServlet;
@@ -151,13 +165,17 @@ namespace Mainsoft.Web.Hosting {
                public override void EndOfRequest () {
                        if (_endOfSendCallback != null)
                                _endOfSendCallback(this, _endOfSendArgs);
+                       _OutputStream = null;
                }
 
                public override void FlushResponse (bool finalFlush) {
-                       ServletOutputStream servletOutputStream = _HttpServletResponse.getOutputStream();
-                       servletOutputStream.flush();
+                       IPortletActionResponse resp =_HttpServletResponse as IPortletActionResponse;
+                       if (_OutputStream == null || resp != null && resp.isRedirected())
+                               return;
+
+                       _OutputStream.flush();
                        if (finalFlush)
-                               servletOutputStream.close();
+                               _OutputStream.close();
                }
 
                public override string GetAppPath () {
@@ -243,10 +261,9 @@ namespace Mainsoft.Web.Hosting {
                        try {
                                return _HttpServletRequest.getRemotePort();
                        }
-                       catch(Exception e) { //should catch also java.lang.Throwable
-                               //if servlet API is 2.3 and below - there is no
-                               //method getRemotePort in ServletRequest interface...
-                               //should be described as limitation.
+                       catch(Exception e) {
+                               // if servlet API is 2.3 and below - there is no method getRemotePort 
+                // in ServletRequest interface... should be described as limitation.
                                return 0;
                        }
                }
@@ -351,8 +368,12 @@ namespace Mainsoft.Web.Hosting {
                }
 
                public override void SendResponseFromMemory (byte [] data, int length) {
+                       IPortletActionResponse resp =_HttpServletResponse as IPortletActionResponse;
+                       if (_OutputStream == null || resp != null && resp.isRedirected())
+                               return;
+
                        sbyte [] sdata = vmw.common.TypeUtils.ToSByteArray(data);
-                       _HttpServletResponse.getOutputStream().write(sdata, 0 , length);
+                       _OutputStream.write(sdata, 0 , length);
                }
 
                public override void SendStatus(int statusCode, string statusDescription) {