Fixed #83 (Server certificate test: Websphere).

svn changeset:857/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index ed8b6499166b95d97fcc910a672cedb9b1b4907e..4ebb10a4801556043c5319281c43574bca0c8b6b 100644 (file)
--- 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