incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r940750 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Date Tue, 04 May 2010 06:45:25 GMT
Author: cziegeler
Date: Tue May  4 06:45:25 2010
New Revision: 940750

URL: http://svn.apache.org/viewvc?rev=940750&view=rev
Log:
Fix accidentally changed logic.

Modified:
    sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java

Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=940750&r1=940749&r2=940750&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
(original)
+++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Tue May  4 06:45:25 2010
@@ -342,8 +342,8 @@ public class SlingServletResolver implem
                                     scriptName);
                 }
             }
-        } else {
-
+        }
+        if ( servlet == null ) {
             // the resource type is not absolute, so lets go for the deep search
             final NamedScriptResourceCollector locationUtil = NamedScriptResourceCollector.create(scriptName,
resource, this.executionPaths);
             servlet = getServlet(locationUtil, null, resolver);
@@ -555,7 +555,8 @@ public class SlingServletResolver implem
                                     type);
                 }
             }
-        } else {
+        }
+        if ( servlet == null ) {
             // the resource type is not absolute, so lets go for the deep search
             final ResourceCollector locationUtil = ResourceCollector.create(request, resolver.getWorkspaceName(),
this.executionPaths);
             servlet = getServlet(locationUtil, request, resolver);



Mime
View raw message