You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by sr...@apache.org on 2009/10/06 23:39:54 UTC

svn commit: r822522 - in /felix/trunk/http/base/src: main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.java

Author: srs
Date: Tue Oct  6 21:39:54 2009
New Revision: 822522

URL: http://svn.apache.org/viewvc?rev=822522&view=rev
Log:
FELIX-1713: getPathInfo() fix. Stripped everyting away after first ; (semicolon).

Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequest.java
    felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.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=822522&r1=822521&r2=822522&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 Tue Oct  6 21:39:54 2009
@@ -66,9 +66,9 @@
         pathInfo = pathInfo.replaceAll("[/]{2,}", "/");
         pathInfo = pathInfo.substring(servletPathLength);
 
-        int qmarkPos = pathInfo.indexOf('?');
-        if (qmarkPos > 0) {
-            pathInfo = pathInfo.substring(0, qmarkPos);
+        int scPos = pathInfo.indexOf(';');
+        if (scPos > 0) {
+            pathInfo = pathInfo.substring(0, scPos);
         }
 
         if ("".equals(pathInfo) && servletPathLength != 0) {

Modified: felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.java?rev=822522&r1=822521&r2=822522&view=diff
==============================================================================
--- felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.java (original)
+++ felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletHandlerRequestTest.java Tue Oct  6 21:39:54 2009
@@ -37,7 +37,7 @@
 
         superReq = Mockito.mock(HttpServletRequest.class);
         Mockito.when(superReq.getContextPath()).thenReturn("/mycontext");
-        Mockito.when(superReq.getRequestURI()).thenReturn("/mycontext/myservlet/request/to/resource?param=value");
+        Mockito.when(superReq.getRequestURI()).thenReturn("/mycontext/myservlet/request/to/resource;jsession=123");
         this.req2 = new ServletHandlerRequest(superReq, "/myservlet");
     }