diff options
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index ed8b649916..4ebb10a480 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -567,7 +567,7 @@ public class ApplicationServlet extends HttpServlet implements // try to detect it WebBrowser wb = WebBrowserProbe.getTerminalType(request .getSession()); - if ( "detect".equals(unhandledParameters.get("renderingMode")) + if ("detect".equals(unhandledParameters.get("renderingMode")) || wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) { String themeName = application.getTheme(); if (themeName == null) @@ -591,7 +591,7 @@ public class ApplicationServlet extends HttpServlet implements .get("renderingMode"))[0]; if (renderingMode.equals("html")) { wb.setRenderingMode(WebBrowser.RENDERING_MODE_HTML); - } else if(renderingMode.equals("ajax")){ + } else if (renderingMode.equals("ajax")) { wb.setRenderingMode(WebBrowser.RENDERING_MODE_AJAX); } } @@ -1119,6 +1119,9 @@ public class ApplicationServlet extends HttpServlet implements resourcePath = request.getContextPath() + request.getServletPath() + RESOURCE_URI; + // WebSphere Application Server related fix + resourcePath = resourcePath.replaceAll("//", "/"); + String resourceId = request.getPathInfo(); // Check if this really is a resource request |