X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FJsonServerSerializer.java;h=78f3dff948fbe8683086c25b841386f802d1bdcc;hb=fb9857e3c3402fb0b203c3a1d8c51e4897987700;hp=96e6d2765d2d2a9727990bc26472432edace50da;hpb=e38c8ad82cb57e56ab246b1d65f440653bed78f8;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
index 96e6d2765..78f3dff94 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
@@ -27,14 +27,16 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
 	private Boolean asHtml = false;
 
-	// private String encoding = "UTF8";
+	private String contentTypeCharset = "UTF-8";
 
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
 		if (asHtml)
-			response.setContentType("text/html");
+			response.setContentType("text/html;charset=" + contentTypeCharset);
 		else
-			response.setContentType("application/json");
+			response.setContentType("application/json;charset="
+					+ contentTypeCharset);
+
 		try {
 			if (asHtml)
 				response.getWriter().append("<pre>");
@@ -54,9 +56,6 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
 		JsonGenerator jsonGenerator = null;
 		try {
-
-			// jsonGenerator = jsonFactory.createJsonGenerator(response
-			// .getOutputStream(), JsonEncoding.valueOf(encoding));
 			jsonGenerator = jsonFactory.createJsonGenerator(writer);
 
 			if (prettyPrint)
@@ -109,4 +108,9 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 	protected ObjectMapper getObjectMapper() {
 		return objectMapper;
 	}
+
+	public void setContentTypeCharset(String contentTypeCharset) {
+		this.contentTypeCharset = contentTypeCharset;
+	}
+
 }