Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 71084 invoked from network); 8 Mar 2011 01:19:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Mar 2011 01:19:33 -0000 Received: (qmail 90024 invoked by uid 500); 8 Mar 2011 01:19:33 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 89996 invoked by uid 500); 8 Mar 2011 01:19:33 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 89988 invoked by uid 99); 8 Mar 2011 01:19:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2011 01:19:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2011 01:19:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 409F62388901; Tue, 8 Mar 2011 01:19:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1079068 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/security/UserGroupInformation.java Date: Tue, 08 Mar 2011 01:19:10 -0000 To: common-commits@hadoop.apache.org From: jitendra@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110308011910.409F62388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jitendra Date: Tue Mar 8 01:19:09 2011 New Revision: 1079068 URL: http://svn.apache.org/viewvc?rev=1079068&view=rev Log: HADOOP-6912. Guard against NPE when calling UGI.isLoginKeytabBased(). Contributed by Kan Zhang. Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1079068&r1=1079067&r2=1079068&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Tue Mar 8 01:19:09 2011 @@ -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 Modified: hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1079068&r1=1079067&r2=1079068&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java Tue Mar 8 01:19:09 2011 @@ -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; } /**