Merge -c 1295232 from trunk to branch-0.23 to fix HDFS-3012. Exception while renewing delegation token.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295311 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -207,6 +207,9 @@ Release 0.23.2 - UNRELEASED
 
     HDFS-2991. Fix case where OP_ADD would not be logged in append(). (todd)
 
+    HDFS-3012. Exception while renewing delegation token. (Bobby Evans via
+    jitendra)
+
 Release 0.23.1 - 2012-02-17 
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java

@@ -619,6 +619,12 @@ public class DFSClient implements java.io.Closeable {
   @InterfaceAudience.Private
   public static class Renewer extends TokenRenewer {
     
+    static {
+      //Ensure that HDFS Configuration files are loaded before trying to use
+      // the renewer.
+      HdfsConfiguration.init();
+    }
+    
     @Override
     public boolean handleKind(Text kind) {
       return DelegationTokenIdentifier.HDFS_DELEGATION_KIND.equals(kind);