svn commit: r1338360 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
Author: jogep
Date: Mon May 14 19:42:11 2012
New Revision: 1338360
URL: http://svn.apache.org/viewvc?rev=1338360&view=rev
Log:
WW-3815: Dispatching after action phase renders with different
stack/TextProvider
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java?rev=1338360&r1=1338359&r2=1338360&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
Mon May 14 19:42:11 2012
@@ -35,10 +35,7 @@ import javax.portlet.ActionResponse;
import javax.portlet.RenderRequest;
import java.util.Map;
-import static org.apache.struts2.portlet.PortletConstants.EVENT_ACTION;
-import static org.apache.struts2.portlet.PortletConstants.REQUEST;
-import static org.apache.struts2.portlet.PortletConstants.RESPONSE;
-import static
org.apache.struts2.portlet.PortletConstants.STACK_FROM_EVENT_PHASE;
+import static org.apache.struts2.portlet.PortletConstants.*;
public class PortletStateInterceptor extends AbstractInterceptor {
@@ -83,7 +80,7 @@ public class PortletStateInterceptor ext
CompoundRoot oldRoot =
oldStack.getRoot();
ValueStack currentStack =
invocation.getStack();
CompoundRoot root =
currentStack.getRoot();
- root.addAll(oldRoot);
+ root.addAll(0, oldRoot);
if (LOG.isDebugEnabled())
LOG.debug("Restored stack");
}
}
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Index edited by tabish121 (02:14 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Index ActiveMQ-CPP Version 3.4.2 Released edited by tabish121 (02:13 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/04/27/ActiveMQ-CPP+Version+3.4.2+Released Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - SEDA edited by rubytuesdaydono (03:58 PM) https://cwiki.apache.org/confluence/display/CAMEL/SEDA Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - Configuration edited by owu...@apache.org (04:33 PM) https://cwiki.apache.org/confluence/display/CXF/Configuration Tomcat edited by owu...@apache.org (03:06 PM) https://cwiki.apache.org/confluence/display/CXF/Tomcat Fediz edited by owu...@apache.org (03:03 PM) https://cwiki.apache.org/confluence/display/CXF/Fediz Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Client HTTP Transport (including SSL support) edited by cohei...@apache.org (10:47 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/Client+HTTP+Transport+%28including+SSL+support%29 JAX-RS Advanced Features edited by sergey_beryozkin (06:29 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Advanced+Features Apache Felix (https://cwiki.apache.org/confluence/display/FELIX) Pages - iPOJO-news edited by clement.escoffier (08:48 AM) https://cwiki.apache.org/confluence/display/FELIX/iPOJO-news news edited by clement.escoffier (08:47 AM) https://cwiki.apache.org/confluence/display/FELIX/news downloads edited by clement.escoffier (08:45 AM) https://cwiki.apache.org/confluence/display/FELIX/downloads Download edited by clement.escoffier (08:44 AM) https://cwiki.apache.org/confluence/display/FELIX/Download Apache Flume (https://cwiki.apache.org/confluence/display/FLUME) Pages - Project Reports edited by arvind (04:10 PM) https://cwiki.apache.org/confluence/display/FLUME/Project+Reports Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - HBaseIntegration edited by cwsteinbach (08:58 PM) https://cwiki.apache.org/confluence/display/Hive/HBaseIntegration ListBucketing created by namit.jain (07:10 PM) https://cwiki.apache.org/confluence/display/Hive/ListBucketing Presentations edited by cwsteinbach (02:36 PM) https://cwiki.apache.org/confluence/display/Hive/Presentations OFBiz Project Administration Workspace (https://cwiki.apache.org/confluence/display/OFBADMIN) Pages - OFBiz Attic edited by jacques.le.roux (08:06 AM) https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Attic OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Implementation Documentation edited by luvinhthinh.m...@gmail.com (11:34 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Implementation+Documentation Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Improvements for the download webpages edited by kschenk (07:38 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Improvements+for+the+download+webpages Apache OpenOffice Social Promotion Kit edited by robweir (05:26 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Apache+OpenOffice+Social+Promotion+Kit AOO 3.4 Release Notes edited by p...@apache.org (11:24 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+Release+Notes Comments https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home (1) Apache Struts 2 Plugin Registry (https://cwiki.apache.org/confluence/display/S2PLUGINS) Pages - Strut2 jasper report plugin - War deployment created by ricnic (04:57 AM) https://cwiki.apache.org/confluence/display/S2PLUGINS/Strut2+jasper+report+plugin+-+War+deployment Comments https://cwiki.apache.org/confluence/display/S2PLUGINS/Strut2+jasper+report+plugin+-+War+deployment (1) Apache Struts 2 Wiki (https://cwiki.apache.org/c
