Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2008-08-27 15:23:53 +0000
committerSimon Kaegi2008-08-27 15:23:53 +0000
commitb34c9879476caf9a8b441fa28dc82878d6f06d78 (patch)
tree44475c652c8ed19adf043cdd42ca2a182be968ec
parent8df0c6651dca72ae232b8a4e6a35646ab0c8b99a (diff)
downloadrt.equinox.bundles-b34c9879476caf9a8b441fa28dc82878d6f06d78.tar.gz
rt.equinox.bundles-b34c9879476caf9a8b441fa28dc82878d6f06d78.tar.xz
rt.equinox.bundles-b34c9879476caf9a8b441fa28dc82878d6f06d78.zip
Bug 241451 [server] HttpServletRequestAdaptor.getContextPath() returns inconsistent valuesv20080901
-rw-r--r--bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeServlet.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeServlet.java b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeServlet.java
index 6e4485fc0..5347a2fee 100644
--- a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeServlet.java
+++ b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/BridgeServlet.java
@@ -86,13 +86,12 @@ public class BridgeServlet extends HttpServlet {
*
*/
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String pathInfo = req.getPathInfo();
+ // Check if this is being handled by an extension mapping
+ if (pathInfo == null && isExtensionMapping(req.getServletPath()))
+ req = new ExtensionMappingRequest(req);
if (req.getAttribute(INCLUDE_REQUEST_URI_ATTRIBUTE) == null) {
- String pathInfo = req.getPathInfo();
- // Check if this is being handled by an extension mapping
- if (pathInfo == null && isExtensionMapping(req.getServletPath()))
- req = new ExtensionMappingRequest(req);
-
if (enableFrameworkControls) {
if (pathInfo != null && pathInfo.startsWith("/sp_")) { //$NON-NLS-1$
if (serviceFrameworkControls(req, resp)) {
@@ -101,9 +100,9 @@ public class BridgeServlet extends HttpServlet {
}
}
} else {
- String pathInfo = (String) req.getAttribute(INCLUDE_PATH_INFO_ATTRIBUTE);
+ String includePathInfo = (String) req.getAttribute(INCLUDE_PATH_INFO_ATTRIBUTE);
// Check if this is being handled by an extension mapping
- if (pathInfo == null || pathInfo.length() == 0) {
+ if (includePathInfo == null || includePathInfo.length() == 0) {
String servletPath = (String) req.getAttribute(INCLUDE_SERVLET_PATH_ATTRIBUTE);
if (isExtensionMapping(servletPath))
req = new IncludedExtensionMappingRequest(req);

Back to the top