X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fmvc%2FMultipleRepositoryHandlerMapping.java;h=bd5b3700572094c3b248dfba15a27e7a6ce14d08;hb=22365726e2fdcb12e76c3d78060960ae7161628e;hp=bc333ba4400d15d87e951c85ca8aa6400d295bb7;hpb=a171094436482fa16e8da47d5501df59ec06e595;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java
index bc333ba44..bd5b37005 100644
--- a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java
+++ b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java
@@ -1,6 +1,5 @@
 package org.argeo.jcr.mvc;
 
-import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
@@ -15,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.RepositoryRegister;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -51,26 +51,7 @@ public abstract class MultipleRepositoryHandlerMapping implements
 		String pathInfo = request.getPathInfo();
 
 		// tokenize path
-		// TODO factorize
-		List<String> tokens = new ArrayList<String>();
-		StringBuffer curr = new StringBuffer();
-		char[] arr = pathInfo.toCharArray();
-		chars: for (int i = 0; i < arr.length; i++) {
-			char c = arr[i];
-			if (c == '/') {
-				if (i == 0 || (i == arr.length - 1))
-					continue chars;
-				if (curr.length() > 0) {
-					tokens.add(curr.toString());
-					curr = new StringBuffer();
-				}
-			} else
-				curr.append(c);
-		}
-		if (curr.length() > 0) {
-			tokens.add(curr.toString());
-			curr = new StringBuffer();
-		}
+		List<String> tokens = JcrUtils.tokenize(pathInfo);
 
 		// check if repository can be found
 		if (tokens.size() == 0