From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 30 May 2007 14:59:33 +0000 (+0000)
Subject: Fixed custom index.html pages. Broken after change [1531]
X-Git-Tag: 6.7.0.beta1~6362
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fbc5e3d0cf6b98396fe5197e33220bb1dc23a742;p=vaadin-framework.git

Fixed custom index.html pages. Broken after change [1531]

svn changeset:1536/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index cc43671747..7e2d823fd2 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -78,12 +78,10 @@ import com.itmill.toolkit.service.License.LicenseViolation;
 import com.itmill.toolkit.terminal.DownloadStream;
 import com.itmill.toolkit.terminal.Paintable;
 import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.StreamResource;
 import com.itmill.toolkit.terminal.ThemeResource;
 import com.itmill.toolkit.terminal.URIHandler;
 import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent;
 import com.itmill.toolkit.terminal.web.ThemeSource.ThemeException;
-import com.itmill.toolkit.terminal.web.WebBrowser;
 import com.itmill.toolkit.ui.Window;
 
 /**
@@ -1247,9 +1245,15 @@ public class ApplicationServlet extends HttpServlet implements
 			
 			Theme t = themeSource.getThemeByName(parts[2]);
 			try {
+				WebBrowser wb = WebBrowserProbe.getTerminalType(request.getSession());
+				if(wb == null) {
+					// Request is propably coming from self made html file, run browser probe
+					WebBrowserProbe
+							.handleProbeRequest(request, new HashMap());
+					wb = WebBrowserProbe.getTerminalType(request.getSession());
+				}
 				if(resourceId.endsWith("compiledstyle.css")) {
-					writeCss(response, WebBrowserProbe.getTerminalType(request
-							.getSession()), t);
+					writeCss(response, wb, t);
 				} else {
 					writeJavascript(response, WebBrowserProbe.getTerminalType(request
 							.getSession()), t);