1 files changed, 2 insertions, 3 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java
index 7bcf430cb..fc6952116 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java
@@ -31,7 +31,6 @@ import javax.ws.rs.container.ResourceInfo;
 import javax.ws.rs.core.FeatureContext;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URLEncoder;
 
@@ -75,12 +74,12 @@ public class AuthDynamicFeature implements DynamicFeature {
     private static AuthCheckFilter INSTANCE = new AuthCheckFilter();
 
     @Override
-    public void filter(ContainerRequestContext requestContext) throws IOException {
+    public void filter(ContainerRequestContext requestContext) {
       final SecurityContext sc = requestContext.getSecurityContext();
       if (!isUserLoggedIn(sc)) {
         try {
           final String destResource =
-              URLEncoder.encode(requestContext.getUriInfo().getRequestUri().toString(), "UTF-8");
+              URLEncoder.encode(requestContext.getUriInfo().getRequestUri().getPath(), "UTF-8");
           final URI loginURI = requestContext.getUriInfo().getBaseUriBuilder()
               .path(WebServerConstants.MAIN_LOGIN_RESOURCE_NAME)
               .queryParam(WebServerConstants.REDIRECT_QUERY_PARM, destResource)