diff --git a/core/src/main/java/org/apache/struts2/result/PostbackResult.java b/core/src/main/java/org/apache/struts2/result/PostbackResult.java index 4c1e52af0..1a275d52e 100644 --- a/core/src/main/java/org/apache/struts2/result/PostbackResult.java +++ b/core/src/main/java/org/apache/struts2/result/PostbackResult.java @@ -134,9 +134,9 @@ public class PostbackResult extends StrutsResultSupport { if (actionName != null) { actionName = conditionalParse(actionName, invocation); + parseLocation = false; if (namespace == null) { namespace = invocation.getProxy().getNamespace(); - parseLocation = false; } else { namespace = conditionalParse(namespace, invocation); } diff --git a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java index 5b800e249..ed6825b12 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java @@ -159,9 +159,9 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement */ public void execute(ActionInvocation invocation) throws Exception { actionName = conditionalParse(actionName, invocation); + parseLocation = false; if (namespace == null) { namespace = invocation.getProxy().getNamespace(); - parseLocation = false; } else { namespace = conditionalParse(namespace, invocation); } diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java index db4f98a38..282f65323 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java @@ -172,6 +172,8 @@ public class PortletActionRedirectResult extends PortletResult { */ public void execute(ActionInvocation invocation) throws Exception { actionName = conditionalParse(actionName, invocation); + parseLocation = false; + String portletNamespace = (String)invocation.getInvocationContext().get(PortletConstants.PORTLET_NAMESPACE); if (portletMode != null) { Map namespaceMap = getNamespaceMap(invocation); @@ -179,7 +181,6 @@ public class PortletActionRedirectResult extends PortletResult { } if (namespace == null) { namespace = invocation.getProxy().getNamespace(); - parseLocation = false; } else { namespace = conditionalParse(namespace, invocation); }