You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2018/05/02 06:45:54 UTC
[struts] branch struts-2-5-x created (now d175836)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git.
at d175836 Changes version to snapshot
This branch includes the following new commits:
new b3bad5e Avoids parsing namespace when using existing namespace
new 6efaf90 Increases scope when location parsing is avoided
new e55ad3f Upgrades Jackson libs to version 2.9.5
new d175836 Changes version to snapshot
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 04/04: Changes version to snapshot
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d175836757d4c26e244eb8fb50ff586e276cdb5f
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed May 2 08:45:44 2018 +0200
Changes version to snapshot
---
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 2 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
pom.xml | 2 +-
34 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index daee3d5..75043fa 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index dc9e174..1298f14 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 06a194c..5bfd922 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d8c608e..5207daa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index ada7f62..57db397 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 2f173cf..626f873 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b9e07a9..18f5891 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 864abd1..93cdd61 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index a91e262..9cd8354 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index bc2df43..264d9dd 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index a83d972..ae15e35 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 5281ffd..d5274bf 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index e555dc3..5720b30 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 0604cf8..b2a8c6f 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 8c15e3e..41dd3a4 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index d030511..569eeaa 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 322fa00..c1a36b4 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 208cf60..d0e4e2c 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 4fccab7..201f7fd 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index d110799..3d0feda 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 5831771..37286e9 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 3e757a5..33ce50e 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index c52d72d..4c3bc1d 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index a194d6a..9658c7b 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index edfb746..3d8820a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 692b862..f218acd 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 0ba812e..e452587 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index e4e7c57..115a8cd 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 6029193..2c4fef5 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index ea1076b..0afc779 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index dc0fa47..5b2c226 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 6887996..c5ad9e1 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 410c600..6bd557d 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ea52c06..531b316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.5.16</version>
+ <version>2.5.17-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 01/04: Avoids parsing namespace when using existing
namespace
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b3bad5ea44f3fd9edb2cb491192c5900f46d45d3
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed May 2 08:04:15 2018 +0200
Avoids parsing namespace when using existing namespace
---
.../src/main/java/com/opensymphony/xwork2/ActionChainResult.java | 9 +++------
core/src/main/java/org/apache/struts2/result/PostbackResult.java | 1 +
.../org/apache/struts2/result/ServletActionRedirectResult.java | 1 +
.../main/java/org/apache/struts2/result/StrutsResultSupport.java | 4 +++-
.../struts2/portlet/result/PortletActionRedirectResult.java | 1 +
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java b/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
index 1550eb9..b842897 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
@@ -201,13 +201,10 @@ public class ActionChainResult implements Result {
* @param invocation the DefaultActionInvocation calling the action call stack
*/
public void execute(ActionInvocation invocation) throws Exception {
- // if the finalNamespace wasn't explicitly defined, assume the current one
- if (this.namespace == null) {
- this.namespace = invocation.getProxy().getNamespace();
- }
-
ValueStack stack = ActionContext.getContext().getValueStack();
- String finalNamespace = TextParseUtil.translateVariables(namespace, stack);
+ String finalNamespace = this.namespace != null
+ ? TextParseUtil.translateVariables(namespace, stack)
+ : invocation.getProxy().getNamespace();
String finalActionName = TextParseUtil.translateVariables(actionName, stack);
String finalMethodName = this.methodName != null
? TextParseUtil.translateVariables(this.methodName, stack)
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 d040fbb..4c1e52a 100644
--- a/core/src/main/java/org/apache/struts2/result/PostbackResult.java
+++ b/core/src/main/java/org/apache/struts2/result/PostbackResult.java
@@ -136,6 +136,7 @@ public class PostbackResult extends StrutsResultSupport {
actionName = conditionalParse(actionName, invocation);
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 b5356ad..5b800e2 100644
--- a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
@@ -161,6 +161,7 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement
actionName = conditionalParse(actionName, invocation);
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/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
index a21e095..d5307d2 100644
--- a/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
+++ b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
@@ -122,6 +122,8 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics {
/** use UTF-8 as this is the recommended encoding by W3C to avoid incompatibilities. */
public static final String DEFAULT_URL_ENCODING = "UTF-8";
+ protected boolean parseLocation = true;
+
private boolean parse;
private boolean encode;
private String location;
@@ -200,7 +202,7 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics {
* @throws Exception if an error occurs while executing the result.
*/
public void execute(ActionInvocation invocation) throws Exception {
- lastFinalLocation = conditionalParse(location, invocation);
+ lastFinalLocation = parseLocation ? conditionalParse(location, invocation) : location;
doExecute(lastFinalLocation, 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 4b561ca..db4f98a 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
@@ -179,6 +179,7 @@ public class PortletActionRedirectResult extends PortletResult {
}
if (namespace == null) {
namespace = invocation.getProxy().getNamespace();
+ parseLocation = false;
} else {
namespace = conditionalParse(namespace, invocation);
}
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 03/04: Upgrades Jackson libs to version 2.9.5
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e55ad3fb4540f7c106cda678bb164faff66513f0
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed May 2 08:35:52 2018 +0200
Upgrades Jackson libs to version 2.9.5
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d6fe0ee..ea52c06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<tiles.version>3.0.7</tiles.version>
<tiles-request.version>1.0.6</tiles-request.version>
<log4j2.version>2.10.0</log4j2.version>
- <jackson.version>2.9.4</jackson.version>
+ <jackson.version>2.9.5</jackson.version>
<!-- Site generation -->
<fluido-skin.version>1.6</fluido-skin.version>
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 02/04: Increases scope when location parsing is avoided
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6efaf900d4ffb7be8a74065af5553bad2389f729
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed May 2 08:25:06 2018 +0200
Increases scope when location parsing is avoided
---
core/src/main/java/org/apache/struts2/result/PostbackResult.java | 2 +-
.../java/org/apache/struts2/result/ServletActionRedirectResult.java | 2 +-
.../org/apache/struts2/portlet/result/PortletActionRedirectResult.java | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
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 4c1e52a..1a275d5 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 5b800e2..ed6825b 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 db4f98a..282f653 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<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);
}
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.