Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increases scope when location parsing is avoided

Browse Source
This commit is contained in:
Lukasz Lenart
2018-05-02 08:25:06 +02:00
parent b3bad5ea44
commit 6efaf900d4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/result/PostbackResult.java
+1 -1
View File
@@ -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);
}
core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
+1 -1
View File
@@ -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);
}
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
+2 -1
View File
@@ -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<PortletMode, String> 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);
}