diff --git jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java index 516825fa45..7f541b99ea 100644 --- jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java +++ jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java @@ -42,7 +42,7 @@ Subject loggedInSubject; // A fair reentrant lock - private static ReentrantLock kerberosLock = new ReentrantLock(true); + private static final ReentrantLock kerberosLock = new ReentrantLock(true); public HttpKerberosRequestInterceptor(String principal, String host, String serverHttpUrl, Subject loggedInSubject, CookieStore cs, String cn, boolean isSSL, Map additionalHeaders, @@ -64,7 +64,12 @@ protected void addHttpAuthHeader(HttpRequest httpRequest, HttpContext httpContex // Set the session key token (Base64 encoded) in the headers httpRequest.addHeader(HttpAuthUtils.AUTHORIZATION + ": " + HttpAuthUtils.NEGOTIATE + " ", kerberosAuthHeader); } catch (Exception e) { - throw new HttpException(e.getMessage(), e); + String message = e.getMessage(); + if (message != null) { + throw new HttpException(message, e); + } else { + throw new HttpException("", e); + } } finally { kerberosLock.unlock(); } diff --git jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java index 1e6ddebfeb..664f24c52f 100644 --- jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java +++ jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java @@ -101,7 +101,12 @@ public void process(HttpRequest httpRequest, HttpContext httpContext) httpRequest.addHeader("Cookie", cookieHeaderKeyValues); } } catch (Exception e) { - throw new HttpException(e.getMessage(), e); + String message = e.getMessage(); + if (message != null) { + throw new HttpException(message, e); + } else { + throw new HttpException("", e); + } } } }