From 8ca2735e946b0bbe490d58ecba8d399e45ee258a Mon Sep 17 00:00:00 2001 From: Johannes Geppert Date: Mon, 14 May 2012 19:42:11 +0000 Subject: [PATCH] WW-3815: Dispatching after action phase renders with different stack/TextProvider git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1338360 13f79535-47bb-0310-9956-ffa450edef68 --- .../portlet/interceptor/PortletStateInterceptor.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java index 3c7a1334b..536882c6c 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java @@ -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 extends AbstractInterceptor { 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"); } }