SLING-1965 Append current query string to redirect target for all target URLs, not just absolute URLs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1066361 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java b/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
index 7172e2e..298ecf0 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
@@ -149,6 +149,11 @@
targetPath = toRedirectPath(targetPath, request);
}
+ // append current querystring
+ if (request.getQueryString() != null) {
+ targetPath += "?" + request.getQueryString();
+ }
+
final int status = getStatus(valueMap);
// redirect the client, use our own setup since we might have a
@@ -237,11 +242,6 @@
}
}
- // append current querystring
- if (request.getQueryString() != null) {
- target.append('?').append(request.getQueryString());
- }
-
// return the mapped full path and return if already an absolute URI
final String finalTarget = request.getResourceResolver().map(request, target.toString());
if (isUrl(finalTarget)) {
