Fix improve path interception

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeHttp.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index a9142c9334cdc69aaa00a6da487b6be1b18edfb0..f0fbe461a1dfc8ecc5d5c5be3862c60587d48983 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -229,9 +229,11 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                        }
 
                        // redirect long RWT paths to anchor
-                       String path = request.getRequestURI()
-                                       .substring(servletPath.length()).trim();
-                       if (!servletPath.endsWith("rwt-resources") && !path.equals("")
+                       String path = request.getRequestURI().substring(
+                                       servletPath.length());
+                       int pathLength = path.length();
+                       if (pathLength != 0 && (path.charAt(0) == '/')
+                                       && !servletPath.endsWith("rwt-resources")
                                        && !path.equals("/")) {
                                String newLocation = request.getServletPath() + "#" + path;
                                response.setHeader("Location", newLocation);