summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorOlli Virtanen <olli.virtanen@oath.com>2018-06-28 13:41:01 +0200
committerOlli Virtanen <olli.virtanen@oath.com>2018-06-28 13:41:01 +0200
commit76282ba6b1964d4eb5f01afdbb47cef34a943e23 (patch)
treeeb33bfd30c434727beb16358a12bb8188d9960b3 /document
parentdb82daf1712496892d5b84ac9b39f1d05f4e37c6 (diff)
Explicit UTF-8 charset
Diffstat (limited to 'document')
-rw-r--r--document/src/main/java/com/yahoo/document/Document.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index cac0156a98c..23beab7523e 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -22,6 +22,7 @@ import com.yahoo.vespa.objects.Serializer;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import java.util.Map;
@@ -284,7 +285,11 @@ public class Document extends StructuredFieldValue {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
JsonWriter writer = new JsonWriter(buffer);
writer.write(this);
- return buffer.toString();
+ try {
+ return buffer.toString("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
}
/** Returns true if the argument is a document which has the same set of values */