svn commit: r902619 - /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java

[fmeschbe]

Author: fmeschbe
Date: Sun Jan 24 18:58:05 2010
New Revision: 902619

URL: http://svn.apache.org/viewvc?rev=902619&view=rev
Log:
FELIX-1979 Apply improved patch based on servlet container's path info 
(dropping the need for decoding and cutting of servlet path)

Modified:
    
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java

Modified: 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java?rev=902619&r1=902618&r2=902619&view=diff
==============================================================================
--- 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java
 (original)
+++ 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java
 Sun Jan 24 18:58:05 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.felix.http.base.internal.handler;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletRequest;
 
@@ -88,37 +85,32 @@
 
     private String calculatePathInfo()
     {
-        final int servletPathLength = getServletPath().length();
-        final String contextPath = getContextPath();
-
-        String pathInfo = getRequestURI();
-        pathInfo = pathInfo.substring(contextPath.length());
-        pathInfo = pathInfo.replaceAll("[/]{2,}", "/");
-        pathInfo = pathInfo.substring(servletPathLength);
-
-        int scPos = pathInfo.indexOf(';');
-        if (scPos > 0) {
-            pathInfo = pathInfo.substring(0, scPos);
-        }
-
-        try {
-            pathInfo = URLDecoder.decode(pathInfo, "UTF-8");
-        } catch (UnsupportedEncodingException uee) {
-            // not really expected here, UTF-8 is required
-        } catch (IllegalArgumentException iae) {
-            // illegal encoding used, don't care
-        }
+        /*
+         * The pathInfo from the servlet container is
+         *       servletAlias + pathInfo
+         * where pathInfo is either an empty string (in which case the
+         * client directly requested the servlet) or starts with a slash
+         * (in which case the client requested a child of the servlet).
+         *
+         * Note, the servlet container pathInfo may also be null if the
+         * servlet is registered as the root servlet
+         */
+
+        String pathInfo = super.getPathInfo();
+        if (pathInfo != null) {
+
+            // cut off alias of this servlet (if not the root servlet)
+            if (!"/".equals(alias)) {
+                pathInfo = pathInfo.substring(alias.length());
+            }
+
+            // ensure empty string is coerced to null
+            if (pathInfo.length() == 0) {
+                pathInfo = null;
+            }
 
-        if ("".equals(pathInfo) && servletPathLength != 0) {
-            pathInfo = null;
         }
 
-        if (pathInfo != null && !pathInfo.startsWith("/")) {
-            pathInfo = "/" + pathInfo;
-        }
-
-
-
         return pathInfo;
     }
 }