X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fhttp%2FHtmlServlet.java;h=f997c6dec2a60b4989a25d6a8a112f3353aab1b5;hb=7916de8658747a0c0a2a48bcca51a624b46e79b3;hp=b4990c3f429635193804b11c138c2bb3d7171a13;hpb=00baefdde06ccc6acd6493f5752b98f008419feb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/HtmlServlet.java b/org.argeo.cms/src/org/argeo/cms/internal/http/HtmlServlet.java
index b4990c3f4..f997c6dec 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/HtmlServlet.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/HtmlServlet.java
@@ -2,6 +2,8 @@ package org.argeo.cms.internal.http;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.Map;
@@ -80,16 +82,19 @@ public class HtmlServlet extends HttpServlet {
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		String path = req.getPathInfo();
+//		String path = req.getPathInfo();
+		String path = URLDecoder.decode(req.getPathInfo(), StandardCharsets.UTF_8.name());
 		String servletPath = req.getServletPath();
 		String[] p = path.split("/");
 
-		String basePath =servletPath+'/'+p[1];
+		String basePath = servletPath + '/' + p[1];
 		String template = p[1] + ".ftl";
 		StringBuilder sb = new StringBuilder();
 		for (int i = 2; i < p.length; i++)
 			sb.append('/').append(p[i]);
-
+		String nodePath = sb.toString();
+		if ("".equals(nodePath.trim()))
+			nodePath = "/"; // root node
 		Session session = null;
 		try {
 			LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
@@ -104,7 +109,7 @@ public class HtmlServlet extends HttpServlet {
 				}
 			});
 
-			Node node = session.getNode(sb.toString());
+			Node node = session.getNode(nodePath);
 
 			Template t = cfg.getTemplate(template);
 			Map<String, Object> root = new HashMap<>();
@@ -115,7 +120,7 @@ public class HtmlServlet extends HttpServlet {
 
 			resp.setContentType("text/html");
 		} catch (Exception e) {
-			throw new CmsException("Cannot log in", e);
+			throw new CmsException("Cannot process template", e);
 		} finally {
 			JcrUtils.logoutQuietly(session);
 		}