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/02 16:53:12 UTC
[1/3] struts git commit: fix for WW-4269
Repository: struts
Updated Branches:
refs/heads/master 30fd44f0e -> 3480bc3c1
fix for WW-4269
blank double results in NumberFormatException being thrown on sending
JSON in request body
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/db483ccd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/db483ccd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/db483ccd
Branch: refs/heads/master
Commit: db483ccd153caa97137f00cb4ff2ebd35143d56e
Parents: 30fd44f
Author: Victor Sosa <vi...@peopleware.do>
Authored: Wed Dec 30 13:36:58 2015 -0400
Committer: Victor Sosa <vi...@peopleware.do>
Committed: Wed Dec 30 13:36:58 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/struts2/json/JSONReader.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/db483ccd/plugins/json/src/main/java/org/apache/struts2/json/JSONReader.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONReader.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONReader.java
index 3f8c175..75abb19 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONReader.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONReader.java
@@ -155,6 +155,7 @@ public class JSONReader {
return new JSONException("Input string is not well formed JSON (invalid char " + this.c + ")");
}
+
@SuppressWarnings("unchecked")
protected List array() throws JSONException {
List ret = new ArrayList();
@@ -174,7 +175,7 @@ public class JSONReader {
return ret;
}
- protected Object number() {
+ protected Object number() throws JSONException {
this.buf.setLength(0);
boolean toDouble = false;
@@ -202,9 +203,17 @@ public class JSONReader {
}
if (toDouble) {
- return Double.parseDouble(this.buf.toString());
+ try {
+ return Double.parseDouble(this.buf.toString());
+ } catch (NumberFormatException e) {
+ throw buildInvalidInputException();
+ }
} else {
- return Long.parseLong(this.buf.toString());
+ try {
+ return Long.parseLong(this.buf.toString());
+ } catch (NumberFormatException e) {
+ throw buildInvalidInputException();
+ }
}
}
[2/3] struts git commit: Fix to ww-4577 and ww-4576
Posted by lu...@apache.org.
Fix to ww-4577 and ww-4576
Upgrade OGNL to version 3.1.2
Upgrade to Log4j2 version 2.5
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9cc383e4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9cc383e4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9cc383e4
Branch: refs/heads/master
Commit: 9cc383e436acc4fb360059fa923e9ec0f8fe6555
Parents: db483cc
Author: Victor Sosa <vi...@gmail.com>
Authored: Thu Dec 31 16:53:38 2015 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Thu Dec 31 16:53:38 2015 -0400
----------------------------------------------------------------------
core/pom.xml | 1 +
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/9cc383e4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 91cc5eb..1795597 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -240,6 +240,7 @@
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
+ <version>${ognl.version}</version>
</dependency>
<!-- Velocity -->
http://git-wip-us.apache.org/repos/asf/struts/blob/9cc383e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b33c88..862630b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,11 @@
<properties>
<currentVersion>${project.version}</currentVersion>
<struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
- <ognl.version>3.1.1</ognl.version>
+ <ognl.version>3.1.2</ognl.version>
<asm.version>3.3</asm.version>
<asm5.version>5.0.2</asm5.version>
<tiles.version>2.0.6</tiles.version>
- <log4j2.version>2.3</log4j2.version>
+ <log4j2.version>2.5</log4j2.version>
<!-- SCM Site Configuration -->
<site.mainDirectory>${project.build.directory}/site</site.mainDirectory>
[3/3] struts git commit: version removed
Posted by lu...@apache.org.
version removed
version removed, it is on the parent already
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3480bc3c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3480bc3c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3480bc3c
Branch: refs/heads/master
Commit: 3480bc3c106a48da25269bab2ff4078040ffd593
Parents: 9cc383e
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Sat Jan 2 11:15:52 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Sat Jan 2 11:15:52 2016 -0400
----------------------------------------------------------------------
core/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3480bc3c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1795597..91cc5eb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -240,7 +240,6 @@
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
- <version>${ognl.version}</version>
</dependency>
<!-- Velocity -->