You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 05:38:30 UTC

svn commit: r1079137 - /hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java

Author: omalley
Date: Tue Mar  8 04:38:30 2011
New Revision: 1079137

URL: http://svn.apache.org/viewvc?rev=1079137&view=rev
Log:
commit a6803b0a30e5022e1b11930b900c8f70ac5cf80f
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Fri Nov 19 18:52:25 2010 -0800

    . Fixes the relogin to do relogin even if the TGT is null. Contributed by Kan Zhang.
    
    +++ b/YAHOO-CHANGES.txt
    +    . Fixes the relogin to do relogin even if the TGT is null.
    +    (Kan Zhang via ddas)

Modified:
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1079137&r1=1079136&r2=1079137&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/security/UserGroupInformation.java Tue Mar  8 04:38:30 2011
@@ -504,7 +504,7 @@ public class UserGroupInformation {
    * Get the Kerberos TGT
    * @return the user's TGT or null if none was found
    */
-  private KerberosTicket getTGT() {
+  private synchronized KerberosTicket getTGT() {
     Set<KerberosTicket> tickets = subject
         .getPrivateCredentials(KerberosTicket.class);
     for (KerberosTicket ticket : tickets) {
@@ -636,11 +636,8 @@ public class UserGroupInformation {
       return;
     
     KerberosTicket tgt = getTGT();
-    if (tgt == null) {
-      return;
-    }
     //Return if TGT is valid and is not going to expire soon.
-    if (System.currentTimeMillis() < getRefreshTime(tgt)) {
+    if (tgt != null && System.currentTimeMillis() < getRefreshTime(tgt)) {
       return;
     }