Repository: hbase Updated Branches: refs/heads/branch-1.2 936203684 -> cd920940b
HBASE-15148 Resolve IS2_INCONSISTENT_SYNC findbugs warning in AuthenticationTokenSecretManager (Yu Li) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cd920940 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cd920940 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cd920940 Branch: refs/heads/branch-1.2 Commit: cd920940b736f1674780a4f8f5fd888023a3551e Parents: 9362036 Author: tedyu <[email protected]> Authored: Fri Jan 22 02:50:02 2016 -0800 Committer: tedyu <[email protected]> Committed: Fri Jan 22 02:50:02 2016 -0800 ---------------------------------------------------------------------- .../security/token/AuthenticationTokenSecretManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cd920940/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java index 09b8846..0951093 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java @@ -287,6 +287,10 @@ public class AuthenticationTokenSecretManager } } + synchronized long getLastKeyUpdate() { + return lastKeyUpdate; + } + public static SecretKey createSecretKey(byte[] raw) { return SecretManager.createSecretKey(raw); } @@ -340,10 +344,7 @@ public class AuthenticationTokenSecretManager // clear any expired removeExpiredKeys(); - long localLastKeyUpdate; - synchronized (this) { - localLastKeyUpdate = lastKeyUpdate; - } + long localLastKeyUpdate = getLastKeyUpdate(); if (localLastKeyUpdate + keyUpdateInterval < now) { // roll a new master key rollCurrentKey();
