You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/01/28 14:40:57 UTC
svn commit: r615876 -
/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java
Author: fmeschbe
Date: Mon Jan 28 05:40:55 2008
New Revision: 615876
URL: http://svn.apache.org/viewvc?rev=615876&view=rev
Log:
Do not try to execute the resource
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java?rev=615876&r1=615875&r2=615876&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultServlet.java Mon Jan 28 05:40:55 2008
@@ -75,19 +75,13 @@
// check whether we have a directly addressed script
if (extension == null) {
- // check whether the resource adapts to servlet (maybe script)
- Servlet resourceServlet = resource.adaptTo(Servlet.class);
- if (resourceServlet != null) {
- resourceServlet.service(request, response);
- return;
- }
-
// check whether the resource adapts to a stream, spool then
InputStream stream = resource.adaptTo(InputStream.class);
if (stream != null) {
stream(response, resource, stream);
return;
}
+
}
// format response according to extension (use Mime mapping instead)