From c8ff33eec5156423374e747bb93c745af7cf33c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Mon, 22 Aug 2011 14:51:51 +0000 Subject: [PATCH] #7032 LoginForm should explicitly define utf-8 charset in getLoginHTML() method svn changeset:20546/svn branch:6.7 --- src/com/vaadin/ui/LoginForm.java | 90 +++++++++++++++++--------------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 6c1edb8171..509a072c27 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -5,6 +5,7 @@ package com.vaadin.ui; import java.io.ByteArrayInputStream; import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; import java.net.URL; import java.util.HashMap; @@ -136,48 +137,53 @@ public class LoginForm extends CustomComponent { String appUri = getApplication().getURL().toString() + getWindow().getName() + "/"; - return ("\n" + "" - + "" - + "" - + "
" - + "" - + "
" - + "
" - + usernameCaption - + "
" - + "
" - + "
" - + passwordCaption - + "
" - + "
" - + "
" - + loginButtonCaption + "
" + "") - .getBytes(); + try { + return ("\n" + "" + + "" + + "" + + "
" + + "" + + "
" + + "
" + + usernameCaption + + "
" + + "
" + + "
" + + passwordCaption + + "
" + + "
" + + "
" + + loginButtonCaption + + "
" + "") + .getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("UTF-8 encoding not avalable", e); + } } @Override -- 2.39.5