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/04 21:07:05 UTC
[2/7] struts git commit: Patch WW-3945
Patch WW-3945
Set default encoding for JSONResult to UTF-8
Now the default encoding is UTF-8 for JSON as should be.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b198e3bf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b198e3bf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b198e3bf
Branch: refs/heads/master
Commit: b198e3bf3d70f7bfd5b8d560a848261b4855be2e
Parents: 38da3f6
Author: Victor Sosa <vi...@gmail.com>
Authored: Sun Jan 3 08:05:03 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Mon Jan 4 12:20:58 2016 -0400
----------------------------------------------------------------------
.../apache/struts2/views/jasperreports/JasperReportsResult.java | 2 --
plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b198e3bf/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index 921a010..e356506 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -385,8 +385,6 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
} catch (JRException e) {
LOG.error("Error producing {} report for uri {}", format, systemId, e);
throw new ServletException(e.getMessage(), e);
- } finally {
- conn.close();
}
response.setContentLength(output.size());
http://git-wip-us.apache.org/repos/asf/struts/blob/b198e3bf/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
index 3475be0..5f14a8d 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
@@ -80,7 +80,7 @@ public class JSONResult implements Result {
public static final String DEFAULT_PARAM = null;
private String encoding;
- private String defaultEncoding = "ISO-8859-1";
+ private String defaultEncoding = "UTF-8";
private List<Pattern> includeProperties;
private List<Pattern> excludeProperties;
private String root;