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/15 10:02:22 UTC
svn commit: r612042 -
/incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
Author: fmeschbe
Date: Tue Jan 15 01:02:17 2008
New Revision: 612042
URL: http://svn.apache.org/viewvc?rev=612042&view=rev
Log:
Make sure the explicite paths used to register the servlets are absolute
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
Modified: incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java?rev=612042&r1=612041&r2=612042&view=diff
==============================================================================
--- incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java (original)
+++ incubator/sling/whiteboard/fmeschbe/resource/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java Tue Jan 15 01:02:17 2008
@@ -47,6 +47,12 @@
// check whether explicit paths are set
String[] paths = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_PATHS));
if (paths != null && paths.length > 0) {
+ for (int i=0; i < paths.length; i++) {
+ if (!paths[i].startsWith("/")) {
+ paths[i] = servletRoot + paths[i];
+ }
+
+ }
return new ServletResourceProvider(paths, servlet);
}