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 cc436717470bd079985341afb22e6a5ade332a51..7e2d823fd2f15a7c624552e2b27b9d0b49202405 100644 (file)
--- 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);