svn commit: r631120 - /incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

[fm...@apache.org]

Author: fmeschbe
Date: Tue Feb 26 00:01:07 2008
New Revision: 631120

URL: http://svn.apache.org/viewvc?rev=631120&view=rev
Log:
SLING-276 Do not try to execute directly addressed scripts

Modified:
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=631120&r1=631119&r2=631120&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Tue Feb 26 00:01:07 2008
@@ -121,17 +121,6 @@
      */
     public Servlet resolveServlet(SlingHttpServletRequest request) {
 
-        // TODO: tentative implementation
-        // if the request extension is not null and the request resource adapts
-        // to a servlet, use that directly
-        // check whether the resource adapts to servlet (maybe script)
-        if (request.getRequestPathInfo().getExtension() != null) {
-            Servlet resourceServlet = request.getResource().adaptTo(Servlet.class);
-            if (resourceServlet != null) {
-                return resourceServlet;
-            }
-        }
-
         Servlet servlet = null;
 
         ResourceResolver resolver = request.getResourceResolver();