From 7ae4649a072459fdf6b24ea44e35711a12665276 Mon Sep 17 00:00:00 2001 From: Denis Anisimov Date: Fri, 11 Sep 2015 19:59:54 +0300 Subject: Always use charset for String.getBytes() method (#18863). Change-Id: I15ce5a7922aebffc1a05ac55663033f7e5134d0c --- server/src/com/vaadin/ui/declarative/Design.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'server/src/com/vaadin/ui/declarative') diff --git a/server/src/com/vaadin/ui/declarative/Design.java b/server/src/com/vaadin/ui/declarative/Design.java index a3589de5e2..63a2638423 100644 --- a/server/src/com/vaadin/ui/declarative/Design.java +++ b/server/src/com/vaadin/ui/declarative/Design.java @@ -59,6 +59,8 @@ import com.vaadin.ui.declarative.DesignContext.ComponentCreationListener; */ public class Design implements Serializable { + private static final String UTF8 = "UTF-8"; + /** * Callback for creating instances of a given component class when reading * designs. The default implementation, {@link DefaultComponentFactory} will @@ -350,7 +352,7 @@ public class Design implements Serializable { */ private static Document parse(InputStream html) { try { - Document doc = Jsoup.parse(html, "UTF-8", "", Parser.htmlParser()); + Document doc = Jsoup.parse(html, UTF8, "", Parser.htmlParser()); return doc; } catch (IOException e) { throw new DesignException("The html document cannot be parsed."); @@ -769,7 +771,8 @@ public class Design implements Serializable { doc.outputSettings().indentAmount(4); doc.outputSettings().syntax(Syntax.html); doc.outputSettings().prettyPrint(true); - outputStream.write(doc.html().getBytes()); + doc.outputSettings(); + outputStream.write(doc.html().getBytes(UTF8)); } } -- cgit v1.2.3