svn commit: r881056 - 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

[srs]

Author: srs
Date: Mon Nov 16 23:38:02 2009
New Revision: 881056

URL: http://svn.apache.org/viewvc?rev=881056&view=rev
Log:
FELIX-1863: Applied patch from Justin Edelson

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=881056&r1=881055&r2=881056&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
 Mon Nov 16 23:38:02 2009
@@ -53,6 +53,9 @@
     @Override
     public String getServletPath()
     {
+        if ("/".equals(this.alias)) {
+            return "";
+        }
         return this.alias;
     }
 

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=881056&r1=881055&r2=881056&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
 Mon Nov 16 23:38:02 2009
@@ -47,4 +47,11 @@
         Assert.assertEquals("/request/to/resource", this.req1.getPathInfo());
         Assert.assertEquals("/request/to/resource", this.req2.getPathInfo());
     }
+    
+    @Test
+    public void testServletPath()
+    {
+        Assert.assertEquals("", this.req1.getServletPath());
+        Assert.assertEquals("/myservlet", this.req2.getServletPath());
+    }
 }