From 7b8650518198db9fbd152640632419d045a6a59b Mon Sep 17 00:00:00 2001 From: Jakub Vavrik Date: Tue, 19 Nov 2013 14:54:09 +0100 Subject: [PATCH] Fixed mangled UTF-8 encoding in field mapping conversion to json. --- .../data/elasticsearch/core/DefaultResultMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java index ab293b418..dab9b5524 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java @@ -16,6 +16,7 @@ import org.springframework.data.elasticsearch.core.facet.FacetResult; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -82,7 +83,7 @@ public class DefaultResultMapper extends AbstractResultMapper { } generator.writeEndObject(); generator.flush(); - return new String(stream.toByteArray()); + return new String(stream.toByteArray(), Charset.forName("UTF-8")); } catch (IOException e) { return null; }