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 968ef9bf1ba43a99d354c18814c85ca6170c5a0f..fe04bddf6a74d3002e6f38aaa22e73a51d878570 100644 (file)
--- 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];