This is an automated email from the ASF dual-hosted git repository. stevel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 705fb8323b4a HADOOP-19119. Spotbugs: possible NPE in org.apache.hadoop.crypto.key.kms.ValueQueue.getSize() (#6642) 705fb8323b4a is described below commit 705fb8323b4a3e988a88093a2e4bc19f07ed5cfe Author: Steve Loughran <ste...@cloudera.com> AuthorDate: Tue Mar 19 17:18:07 2024 +0000 HADOOP-19119. Spotbugs: possible NPE in org.apache.hadoop.crypto.key.kms.ValueQueue.getSize() (#6642) Spotbugs is mistaken here as it doesn't observer the read/write locks used to manage exclusive access to the maps. * cache the value between checks * tag as @VisibleForTesting Contributed by Steve Loughran --- .../main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java index 65eded918d60..58ce443146df 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java @@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.hadoop.classification.VisibleForTesting; import org.apache.hadoop.util.Preconditions; import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder; import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader; @@ -317,8 +318,9 @@ public class ValueQueue <E> { /** * Get size of the Queue for keyName. This is only used in unit tests. * @param keyName the key name - * @return int queue size + * @return int queue size. Zero means the queue is empty or the key does not exist. */ + @VisibleForTesting public int getSize(String keyName) { readLock(keyName); try { @@ -326,10 +328,12 @@ public class ValueQueue <E> { // since that will have the side effect of populating the cache. Map<String, LinkedBlockingQueue<E>> map = keyQueues.getAllPresent(Arrays.asList(keyName)); - if (map.get(keyName) == null) { + final LinkedBlockingQueue<E> linkedQueue = map.get(keyName); + if (linkedQueue == null) { return 0; + } else { + return linkedQueue.size(); } - return map.get(keyName).size(); } finally { readUnlock(keyName); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org