svn commit: r1190097 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/token/Token.java

[tomwhite]

Author: tomwhite
Date: Thu Oct 27 23:54:28 2011
New Revision: 1190097

URL: http://svn.apache.org/viewvc?rev=1190097&view=rev
Log:
Merge -r 1190094:1190095 from trunk to branch. Fixes: HADOOP-7778.

Modified:
    
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
    
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1190097&r1=1190096&r2=1190097&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Oct 27 23:54:28 2011
@@ -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

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java?rev=1190097&r1=1190096&r2=1190097&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
 Thu Oct 27 23:54:28 2011
@@ -119,7 +119,7 @@ public class Token<T extends TokenIdenti
    * Get the token kind
    * @return the kind of the token
    */
-  public Text getKind() {
+  public synchronized Text getKind() {
     return kind;
   }