From: Jani Laakso Date: Tue, 27 Feb 2007 14:35:02 +0000 (+0000) Subject: Fixed #447 X-Git-Tag: 6.7.0.beta1~6557 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3cced4c2d5ef0b9f4120b9abca71bd89d066bd1a;p=vaadin-framework.git Fixed #447 svn changeset:756/svn branch:toolkit --- diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index 968ef9bf1b..fe04bddf6a 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -567,7 +567,8 @@ public class ApplicationServlet extends HttpServlet implements // If rendering mode is not defined try to detect it WebBrowser wb = WebBrowserProbe.getTerminalType(request.getSession()); if(wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) { - String themeName = application.getTheme(); + String themeName = application.getTheme(); + if (themeName == null) themeName = DEFAULT_THEME; if (unhandledParameters.get("theme") != null) { themeName = (String) ((Object[]) unhandledParameters .get("theme"))[0];