From f9b7ebb87eb2beeffb2ca1b0f3b421b0cef4d658 Mon Sep 17 00:00:00 2001
From: Victor Sosa <victornsosa@gmail.com>
Date: Sun, 3 Jan 2016 08:05:03 -0400
Subject: [PATCH] Patch WW-3945

Set default encoding for JSONResult to UTF-8

Now the default encoding is UTF-8 for JSON as should be.
---
 .../struts2/views/jasperreports/JasperReportsResult.java    | 6 +++++-
 .../src/main/java/org/apache/struts2/json/JSONResult.java   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 921a010c0..e0ea121f6 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
@@ -386,7 +386,11 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
             LOG.error("Error producing {} report for uri {}", format, systemId, e);
             throw new ServletException(e.getMessage(), e);
         } finally {
-            conn.close();
+            try {
+                conn.close();
+            } catch (Exception e) {
+                LOG.warn("Could not close db connection properly", e);
+            }
         }
 
         response.setContentLength(output.size());
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 3475be00c..5f14a8d9c 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;