You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/04/23 16:49:02 UTC

svn commit: r767935 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker: JetspeedPortletInvokerService.java LocalPortletInvoker.java

Author: woonsan
Date: Thu Apr 23 14:49:02 2009
New Revision: 767935

URL: http://svn.apache.org/viewvc?rev=767935&view=rev
Log:
JS2-974: Fixed by unwrapping the request/response for local portlets.
So, tomcat can indicate the request to create another request. Thank you, Ate. His solution resolves this problem.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java?rev=767935&r1=767934&r2=767935&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java Thu Apr 23 14:49:02 2009
@@ -145,7 +145,7 @@
         PortletDefinition portletDefinition = (PortletDefinition)requestContext.getPortletWindow().getPortletEntity().getPortletDefinition();
         if (portletDefinition.getApplication().getApplicationType() == PortletApplication.LOCAL)
         {
-            invoker = new LocalPortletInvoker(portalContext);
+            invoker = new LocalPortletInvoker(portalContext, requestResponseUnwrapper);
         }
         else
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java?rev=767935&r1=767934&r2=767935&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java Thu Apr 23 14:49:02 2009
@@ -68,10 +68,12 @@
     protected ServletConfig jetspeedConfig;
     protected PortletDefinition portletDefinition;
     protected boolean activated = false;
+    private ContainerRequestResponseUnwrapper requestResponseUnwrapper;
     
-    public LocalPortletInvoker(PortalContext portalContext)
+    public LocalPortletInvoker(PortalContext portalContext, ContainerRequestResponseUnwrapper requestResponseUnwrapper)
     {
         this.portalContext = portalContext;
+        this.requestResponseUnwrapper = requestResponseUnwrapper;
         activated = false;
     }
     
@@ -138,6 +140,9 @@
             // initialize request/response for portletRequestContext
             HttpServletRequest request = requestContext.getContainerRequest();
             HttpServletResponse response = requestContext.getContainerResponse();
+            
+            request = (HttpServletRequest) requestResponseUnwrapper.unwrapContainerRequest(request);
+            response = (HttpServletResponse) requestResponseUnwrapper.unwrapContainerResponse(response);
             requestContext.init(window.getPortletInstance().getConfig(), this.jetspeedContext, request, response);
             window.getPortletResponseContext().init(request, response);
             



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org