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 2016/01/05 08:40:10 UTC
[1/6] struts git commit: fix for WW-4573
Repository: struts
Updated Branches:
refs/heads/master d862d5b96 -> f457c774e
fix for WW-4573
NPE/ concurrent modification exception
using a CopyOnWriteArrayList. This is to keep Memory consistency on the
ValueStack.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b2572500
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b2572500
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b2572500
Branch: refs/heads/master
Commit: b257250036c05233d072c69189258a69f68ee057
Parents: ec5a301 1df5a75
Author: Victor Sosa <vi...@gmail.com>
Authored: Sat Jan 2 15:34:06 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Sat Jan 2 15:41:48 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] struts git commit: Merge branch 'patch' of
github.com:victorsosa/struts into patch
Posted by lu...@apache.org.
Merge branch 'patch' of github.com:victorsosa/struts into patch
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1e21b7ec
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1e21b7ec
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1e21b7ec
Branch: refs/heads/master
Commit: 1e21b7ec1b04af84e31f7136e88663bc670a502e
Parents: e2ae94c bdc325b
Author: Victor Sosa <vi...@gmail.com>
Authored: Mon Jan 4 18:12:57 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Mon Jan 4 18:12:57 2016 -0400
----------------------------------------------------------------------
core/pom.xml | 1 -
plugins/jasperreports/pom.xml | 4 ++--
.../jasperreports/JasperReportsResult.java | 8 ++++++-
.../org/apache/struts2/json/JSONResult.java | 2 +-
.../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++----------
.../struts2/rest/DefaultHttpHeadersTest.java | 16 +++++++++----
6 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[2/6] struts git commit: Fix for WW-4312
Posted by lu...@apache.org.
Fix for WW-4312
A problem on Iterator tag
and WW-3010 s:iterator fails to iterate over collections containing
null
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1d3d7be4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1d3d7be4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1d3d7be4
Branch: refs/heads/master
Commit: 1d3d7be4668e66314f7385a2b73f1c3a7dff66dd
Parents: b257250
Author: Victor Sosa <vi...@gmail.com>
Authored: Mon Jan 4 18:03:47 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Mon Jan 4 18:03:47 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/struts2/components/IteratorComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1d3d7be4/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
index b62424f..1474fe9 100644
--- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
@@ -304,7 +304,7 @@ public class IteratorComponent extends ContextBean {
String var = getVar();
- if ((var != null) && (currentValue != null)) {
+ if ((var != null)) {
putInContext(currentValue);
}
[3/6] struts git commit: Merge branch 'patch' of
github.com:victorsosa/struts into patch
Posted by lu...@apache.org.
Merge branch 'patch' of github.com:victorsosa/struts into patch
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e2ae94cc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e2ae94cc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e2ae94cc
Branch: refs/heads/master
Commit: e2ae94cc0f260b85d5162d749f047c8cbcc9e58c
Parents: 1d3d7be cfc6f19
Author: Victor Sosa <vi...@gmail.com>
Authored: Mon Jan 4 18:07:47 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Mon Jan 4 18:07:47 2016 -0400
----------------------------------------------------------------------
core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[6/6] struts git commit: WW-4312 Allows null in iterator tag
Posted by lu...@apache.org.
WW-4312 Allows null in iterator tag
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f457c774
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f457c774
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f457c774
Branch: refs/heads/master
Commit: f457c774e9d8c8d58e189da71a3dd00238bcf60c
Parents: d862d5b 1e21b7e
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Jan 5 08:39:43 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Jan 5 08:39:43 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/struts2/components/IteratorComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/6] struts git commit: Merge pull request #2 from apache/master
Posted by lu...@apache.org.
Merge pull request #2 from apache/master
Merge changes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bdc325b0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bdc325b0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bdc325b0
Branch: refs/heads/master
Commit: bdc325b03d17a6ec8bc6f19ecb0f0e9854749502
Parents: cfc6f19 110d63f
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Mon Jan 4 18:08:24 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Mon Jan 4 18:08:24 2016 -0400
----------------------------------------------------------------------
core/pom.xml | 1 -
plugins/jasperreports/pom.xml | 4 ++--
.../jasperreports/JasperReportsResult.java | 8 ++++++-
.../org/apache/struts2/json/JSONResult.java | 2 +-
.../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++----------
.../struts2/rest/DefaultHttpHeadersTest.java | 16 +++++++++----
6 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------