2 files changed, 3 insertions, 5 deletions
diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java
index c882fe027..3a1747842 100644
--- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java
+++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java
@@ -33,7 +33,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;
 
@@ -83,13 +82,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");
+              requestContext.getUriInfo().getRequestUri().getPath(), "UTF-8");
           final URI loginURI = requestContext.getUriInfo().getBaseUriBuilder()
               .path(LogInLogOutPages.LOGIN_RESOURCE)
               .queryParam(LogInLogOutPages.REDIRECT_QUERY_PARM, destResource)
diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebUiPageTree.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebUiPageTree.java
index fc44e4577..58a59d382 100644
--- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebUiPageTree.java
+++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebUiPageTree.java
@@ -117,7 +117,7 @@ public class WebUiPageTree extends PageTree {
         final HttpSession session = request.getSession(true);
         final URI destURI = UriBuilder
             .fromUri(URLDecoder.decode(redirect, "UTF-8")).build();
-        session.setAttribute(FormAuthenticator.__J_URI, destURI.toString());
+        session.setAttribute(FormAuthenticator.__J_URI, destURI.getPath());
       }
 
       return new Viewable("/drill-am/login.ftl", toModel(sc, (Object) null));