This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8555239369a0877eba5bf234315f2135ebed6818 Author: Michael Blow <[email protected]> AuthorDate: Wed Mar 31 08:42:42 2021 -0400 Revert "[NO ISSUE][API] Decode request local path" Thie change loses encoded / characters in path; reverting This reverts commit 2525d512f3cc7b3c3e5fdbc0486632b4fac51507. Change-Id: Ic8684ed854baec1a7e1a5ca7a00d1ccdae0dd1dc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10803 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- .../java/org/apache/hyracks/http/server/AbstractServlet.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java index fa64003..514a7dd 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java @@ -22,8 +22,6 @@ import static com.fasterxml.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHA import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ConcurrentMap; @@ -177,12 +175,7 @@ public abstract class AbstractServlet implements IServlet { public String localPath(IServletRequest request) { final String uri = request.getHttpRequest().uri(); int queryStart = uri.indexOf('?'); - String localPath = queryStart == -1 ? uri.substring(trim(uri)) : uri.substring(trim(uri), queryStart); - try { - return URLDecoder.decode(localPath, StandardCharsets.UTF_8.name()); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(e); - } + return queryStart == -1 ? uri.substring(trim(uri)) : uri.substring(trim(uri), queryStart); } public String servletPath(IServletRequest request) {
