httplite: fix regression in resource path resolution code in test cases.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1228775 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java b/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
index 926e1de..b730224 100644
--- a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
+++ b/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
@@ -70,7 +70,7 @@
this.m_httpContext = resource.getContext();
this.m_name = resource.getName();
this.m_alias = resource.getAlias();
- this.m_aliasIndex = m_alias.length() + 1;
+ this.m_aliasIndex = m_alias.length();
this.m_logger = logger;
}
@@ -124,13 +124,12 @@
*/
private String getResourceName(final String path)
{
- //Ensure that the path begins at root.
- String rpath = path;
- if (!path.startsWith( "/" ))
+ if (path.startsWith( "/" ))
{
- rpath = "/" + path;
- }
-
- return m_name + "/" + rpath.substring(m_aliasIndex);
+ return m_name + path.substring(m_aliasIndex);
+ } else
+ {
+ return m_name + "/" + path.substring(m_aliasIndex);
+ }
}
}