Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hdfs-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1360256 - in
 /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
 src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
Date: Wed, 11 Jul 2012 16:10:51 -0000
To: hdfs-commits@hadoop.apache.org
From: atm@apache.org
Message-Id: <20120711161051.5C14223888E4@eris.apache.org>

Author: atm
Date: Wed Jul 11 16:10:50 2012
New Revision: 1360256

URL: http://svn.apache.org/viewvc?rev=1360256&view=rev
Log:
HDFS-3615. Two BlockTokenSecretManager findbugs warnings. Contributed by Aaron T. Myers.

Modified:
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1360256&r1=1360255&r2=1360256&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jul 11 16:10:50 2012
@@ -299,6 +299,8 @@ Release 2.0.1-alpha - UNRELEASED
     HDFS-3548. NamenodeFsck.copyBlock fails to create a Block Reader.
     (Colin Patrick McCabe via eli)
 
+    HDFS-3615. Two BlockTokenSecretManager findbugs warnings. (atm)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java?rev=1360256&r1=1360255&r2=1360256&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java Wed Jul 11 16:10:50 2012
@@ -116,7 +116,7 @@ public class BlockTokenSecretManager ext
   }
   
   @VisibleForTesting
-  public void setSerialNo(int serialNo) {
+  public synchronized void setSerialNo(int serialNo) {
     this.serialNo = (serialNo & LOW_MASK) | (nnIndex << 31);
   }
 
@@ -189,7 +189,7 @@ public class BlockTokenSecretManager ext
    * Update block keys if update time > update interval.
    * @return true if the keys are updated.
    */
-  public boolean updateKeys(final long updateTime) throws IOException {
+  public synchronized boolean updateKeys(final long updateTime) throws IOException {
     if (updateTime > keyUpdateInterval) {
       return updateKeys();
     }
@@ -371,7 +371,7 @@ public class BlockTokenSecretManager ext
   }
   
   @VisibleForTesting
-  public void setKeyUpdateIntervalForTesting(long millis) {
+  public synchronized void setKeyUpdateIntervalForTesting(long millis) {
     this.keyUpdateInterval = millis;
   }
 
@@ -381,7 +381,7 @@ public class BlockTokenSecretManager ext
   }
   
   @VisibleForTesting
-  public int getSerialNoForTesting() {
+  public synchronized int getSerialNoForTesting() {
     return serialNo;
   }