svn commit: r1338360 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java

[jogep]

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");
                                }
                        }