[Osgi-messages] SF.net SVN: osgi:[256] papoose-cmpn/trunk/http/src

[<osg...@li...>]

Revision: 256
          http://osgi.svn.sourceforge.net/osgi/?rev=256&view=rev
Author:   maguro
Date:     2010-02-25 01:37:32 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
Minor cleanup

Modified Paths:
--------------
    papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletDispatcher.java
    papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletRegistration.java
    papoose-cmpn/trunk/http/src/test/java/org/papoose/http/ServletDispatcherTest.java

Modified: papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletDispatcher.java
===================================================================
--- papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletDispatcher.java	2010-02-24 23:41:47 UTC (rev 255)
+++ papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletDispatcher.java	2010-02-25 01:37:32 UTC (rev 256)
@@ -21,9 +21,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -60,26 +58,12 @@
                 }
             }
 
+            path = path.substring(0, Math.max(0, path.length() - 1));
             int index = path.lastIndexOf('/');
-            if (index == 0) break;
+            if (index == -1) break;
             path = path.substring(0, index);
         }
 
-        if (r == null)
-        {
-            for (ServletRegistration registration : registrations)
-            {
-                if ("/".equals(registration.getAlias()))
-                {
-                    if (registration.getContext().handleSecurity(req, resp))
-                    {
-                        r = registration;
-                        break;
-                    }
-                }
-            }
-        }
-
         if (r != null)
         {
             try

Modified: papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletRegistration.java
===================================================================
--- papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletRegistration.java	2010-02-24 23:41:47 UTC (rev 255)
+++ papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletRegistration.java	2010-02-25 01:37:32 UTC (rev 256)
@@ -32,7 +32,7 @@
 
     ServletRegistration(String alias, Servlet servlet, HttpContext context)
     {
-        this.alias = alias;
+        this.alias = ("/".equals(alias) ? "" : alias);
         this.servlet = servlet;
         this.context = context;
     }

Modified: papoose-cmpn/trunk/http/src/test/java/org/papoose/http/ServletDispatcherTest.java
===================================================================
--- papoose-cmpn/trunk/http/src/test/java/org/papoose/http/ServletDispatcherTest.java	2010-02-24 23:41:47 UTC (rev 255)
+++ papoose-cmpn/trunk/http/src/test/java/org/papoose/http/ServletDispatcherTest.java	2010-02-25 01:37:32 UTC (rev 256)
@@ -23,7 +23,6 @@
 
 import static junit.framework.Assert.fail;
 import org.junit.Test;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.