From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 23 Mar 2007 12:01:33 +0000 (+0000)
Subject: fixes #468
X-Git-Tag: 6.7.0.beta1~6498
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9a9b57be0664202002eeeab88498daf946d819ca;p=vaadin-framework.git

fixes #468

svn changeset:1023/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index deebaee7c7..02f2d333e2 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -570,8 +570,12 @@ public class ApplicationServlet extends HttpServlet implements
 				// try to detect it
 				WebBrowser wb = WebBrowserProbe.getTerminalType(request
 						.getSession());
-				if ("detect".equals(unhandledParameters.get("renderingMode"))
-						|| wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
+				
+				boolean detect = false;
+				if (unhandledParameters.get("renderingMode") != null) {
+					detect = ((String) ( (Object[]) unhandledParameters.get("renderingMode"))[0]).equals("detect");
+				}
+				if (detect || wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
 					String themeName = application.getTheme();
 					if (themeName == null)
 						themeName = DEFAULT_THEME;