svn commit: r761256 - /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java

[at...@apache.org]

Author: ate
Date: Thu Apr  2 11:46:52 2009
New Revision: 761256

URL: http://svn.apache.org/viewvc?rev=761256&view=rev
Log:
Fixing a minor bug in PathInfo mapping concerning *. url patterns.
As those need to be mapped as full path the the servlet (path -> servletPath) which already is the default / catch-all case,
there is  actually no need to keep track of and check against extension mapping url patterns at all.

Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java?rev=761256&r1=761255&r2=761256&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java Thu Apr  2 11:46:52 2009
@@ -34,7 +34,6 @@
 {
     protected List<String> exactServletMappingURLPatterns = new ArrayList<String>();
     protected List<String> pathServletMappingURLPatterns = new ArrayList<String>();
-    protected List<String> extServletMappingURLPatterns = new ArrayList<String>();
     protected boolean defaultServletMapping = false;
     
     private RequestDispatcherPathInfoProviderImpl(Set<String> servletMappingURLPatterns)
@@ -57,8 +56,8 @@
                 }
             }
             else if (pat.startsWith("*."))
-            {
-                extServletMappingURLPatterns.add(pat.substring(1));
+            {                
+                // ignore, will always fallback on full path servlet mapping
             }
             else
             {
@@ -123,16 +122,8 @@
                 index = sub.lastIndexOf('/');
             }
         }
-        if (servletPath == null)
-        {
-            index = path.lastIndexOf('/');
-            int ext = path.indexOf('.', index);
-            if (ext != -1 && ext < path.length()-1 && extServletMappingURLPatterns.contains(path.substring(ext)))
-            {
-                servletPath = index > 0 ? path.substring(0, index) : "";
-                pathInfo = path.substring(index);
-            }
-        }
+        // no need to check for *. extension mapping as it simply means full path to servlet mapping
+        // which is already the default / catch-all solution
         if (servletPath == null)
         {
             servletPath = path;