X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fspring%2FSpringUtils.java;h=8ef13560cf2695a84139c91ad9d77dafe67b2d8b;hb=751669212776bf78fb9c929a3031e27003591410;hp=73f1ffde37647b9465267ef4cec4316e6dcd17c5;hpb=80389feff3ab8e8743db4abfb6493285f72b24dd;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
index 73f1ffde3..8ef13560c 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
@@ -27,7 +27,7 @@ public class SpringUtils {
 		try {
 			if (res.getURL().getPath().equals("/"))
 				return null;
-
+			
 			String urlStr = res.getURL().toString();
 			if (urlStr.charAt(urlStr.length() - 1) == '/')
 				urlStr = urlStr.substring(0, urlStr.length() - 2);
@@ -42,14 +42,8 @@ public class SpringUtils {
 
 	public static String extractRelativePath(Resource ancestor, Resource child) {
 		try {
-			String childPath = child.getURL().getPath();
-			String ancestorPath = ancestor.getURL().getPath();
-
-			if (log.isTraceEnabled())
-				log.trace("extractRelativePath(): childPath=" + childPath
-						+ ", ancestorPath=" + ancestorPath);
-
-			return childPath.substring(ancestorPath.length());
+			
+			return ancestor.getURI().relativize(child.getURI()).toString();
 		} catch (IOException e) {
 			throw new SlcException("Cannot extract relative path of " + child
 					+ " based on " + ancestor, e);