Merge -r 1190094:1190095 from trunk to branch. Fixes: HADOOP-7778.

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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -690,6 +690,8 @@ Release 0.23.0 - Unreleased
 
     HADOOP-7721. Add log before login in KerberosAuthenticationHandler. (jitendra)
 
+    HADOOP-7778. FindBugs warning in Token.getKind(). (tomwhite)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java

@@ -119,7 +119,7 @@ public class Token<T extends TokenIdentifier> implements Writable {
    * Get the token kind
    * @return the kind of the token
    */
-  public Text getKind() {
+  public synchronized Text getKind() {
     return kind;
   }