From: Jani Laakso <jani.laakso@itmill.com>
Date: Mon, 12 Mar 2007 19:57:57 +0000 (+0000)
Subject: Fixed #83 (Server certificate test: Websphere).
X-Git-Tag: 6.7.0.beta1~6534
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d675ce558b45df0322d825c95ad5c2dc64da3b06;p=vaadin-framework.git

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 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