You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by su...@apache.org on 2015/05/28 02:19:00 UTC

knox git commit: KNOX-550 reverting back to original hive kerberos dispatch behavior

Repository: knox
Updated Branches:
  refs/heads/master 5416a7c1d -> f93d47042


KNOX-550 reverting back to original hive kerberos dispatch behavior


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/f93d4704
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f93d4704
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f93d4704

Branch: refs/heads/master
Commit: f93d47042f528681e2a2b0097a9b6a432a2febd2
Parents: 5416a7c
Author: Sumit Gupta <su...@apache.org>
Authored: Wed May 27 20:17:51 2015 -0400
Committer: Sumit Gupta <su...@apache.org>
Committed: Wed May 27 20:17:51 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/f93d4704/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java b/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
index 06f2d3e..47bd9f4 100644
--- a/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
+++ b/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
@@ -24,6 +24,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.params.AuthPolicy;
 import org.apache.http.impl.auth.BasicScheme;
@@ -91,8 +92,8 @@ public class HiveDispatch extends DefaultDispatch {
   }
 
   protected HttpResponse executeKerberosDispatch(HttpUriRequest outboundRequest,
-      DefaultHttpClient client) throws IOException {
-    //DefaultHttpClient client = new DefaultHttpClient();
+      HttpClient httpClient) throws IOException {
+    DefaultHttpClient client = new DefaultHttpClient();
     SPNegoSchemeFactory spNegoSF = new SPNegoSchemeFactory(
           /* stripPort */true);
     // spNegoSF.setSpengoGenerator(new BouncySpnegoTokenGenerator());