You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by cz...@apache.org on 2016/10/17 12:42:30 UTC

svn commit: r1765262 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java

Author: cziegeler
Date: Mon Oct 17 12:42:30 2016
New Revision: 1765262

URL: http://svn.apache.org/viewvc?rev=1765262&view=rev
Log:
SLING-5784 : Use service property to identify the ServletContext registered by Sling

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=1765262&r1=1765261&r2=1765262&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 Mon Oct 17 12:42:30 2016
@@ -163,7 +163,7 @@ public class SlingServletResolver
 
     private static final String[] DEFAULT_DEFAULT_EXTENSIONS = new String[] {"html"};
 
-    @Reference
+    @Reference(target="(name=org.apache.sling)")
     private ServletContext servletContext;
 
     @Reference