From aac547249134ec4f9d5229d28e4fdeef0f6f0dbb Mon Sep 17 00:00:00 2001 From: Jitendra Nath Pandey Date: Tue, 8 Mar 2011 01:19:09 +0000 Subject: [PATCH] HADOOP-6912. Guard against NPE when calling UGI.isLoginKeytabBased(). Contributed by Kan Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1079068 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 +++ src/java/org/apache/hadoop/security/UserGroupInformation.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index ad5a7799ac..ead2d3f88a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -100,6 +100,9 @@ Trunk (unreleased changes) HADOOP-7131. Exceptions thrown by Text methods should include the causing exception. (Uma Maheswara Rao G via todd) + HADOOP-6912. Guard against NPE when calling UGI.isLoginKeytabBased(). + (Kan Zhang via jitendra) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/src/java/org/apache/hadoop/security/UserGroupInformation.java b/src/java/org/apache/hadoop/security/UserGroupInformation.java index 9908f3d09c..085ce61719 100644 --- a/src/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/src/java/org/apache/hadoop/security/UserGroupInformation.java @@ -811,8 +811,8 @@ public class UserGroupInformation { * Did the login happen via keytab * @return true or false */ - public synchronized static boolean isLoginKeytabBased() { - return loginUser.isKeytab; + public synchronized static boolean isLoginKeytabBased() throws IOException { + return getLoginUser().isKeytab; } /**