From f97709beaaadee45c8b5b4a5188e54f2ab562f81 Mon Sep 17 00:00:00 2001
From: He Xiaoqiao <hexiaoqiao@apache.org>
Date: Tue, 2 Feb 2021 13:50:48 +0800
Subject: [PATCH] HDFS-15792. Addendum: ClasscastException while loading
 FSImage. Contributed by Renukaprasad C.

---
 .../hdfs/util/TestReferenceCountMap.java      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestReferenceCountMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestReferenceCountMap.java
index a0019de581..6444778f54 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestReferenceCountMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestReferenceCountMap.java
@@ -23,18 +23,17 @@
 import org.junit.Test;
 
 /**
- * Verify ReferenceCount map in concurrent scenarios
- *
+ * Verify ReferenceCount map in concurrent scenarios.
  */
 public class TestReferenceCountMap {
   //Add these number of references in loop
   public static final int LOOP_COUNTER = 10000;
   //Use 2 global features
-  AclFeature aclFeature1 = new AclFeature(new int[]{1});
-  AclFeature aclFeature2 = new AclFeature(new int[]{2});
+  private AclFeature aclFeature1 = new AclFeature(new int[]{1});
+  private AclFeature aclFeature2 = new AclFeature(new int[]{2});
 
   @Test
-  public void testReferenceCountMap() throws Exception{
+  public void testReferenceCountMap() throws Exception {
     ReferenceCountMap<AclFeature> countMap = new ReferenceCountMap<>();
     countMap.put(aclFeature1);
     countMap.put(aclFeature2);
@@ -63,7 +62,7 @@ public void testReferenceCountMap() throws Exception{
   }
 
   @Test
-  public void testRefCountMapConcurrently() throws Exception{
+  public void testRefCountMapConcurrently() throws Exception {
     ReferenceCountMap<AclFeature> countMap = new ReferenceCountMap<>();
 
     PutThread putThread1 = new PutThread(countMap);
@@ -74,8 +73,10 @@ public void testRefCountMapConcurrently() throws Exception{
 
     putThread1.join();
     putThread2.join();
-    Assert.assertEquals(2 * LOOP_COUNTER, countMap.getReferenceCount(aclFeature1));
-    Assert.assertEquals(2 * LOOP_COUNTER, countMap.getReferenceCount(aclFeature2));
+    Assert.assertEquals(2 * LOOP_COUNTER,
+        countMap.getReferenceCount(aclFeature1));
+    Assert.assertEquals(2 * LOOP_COUNTER,
+        countMap.getReferenceCount(aclFeature2));
 
     removeThread1.start();
     removeThread1.join();
@@ -83,9 +84,9 @@ public void testRefCountMapConcurrently() throws Exception{
     Assert.assertEquals(LOOP_COUNTER, countMap.getReferenceCount(aclFeature2));
   }
 
-  class PutThread extends Thread{
-    ReferenceCountMap<AclFeature> referenceCountMap;
-    public PutThread(ReferenceCountMap<AclFeature> referenceCountMap){
+  class PutThread extends Thread {
+    private ReferenceCountMap<AclFeature> referenceCountMap;
+    PutThread(ReferenceCountMap<AclFeature> referenceCountMap) {
       this.referenceCountMap = referenceCountMap;
     }
     @Override
@@ -97,9 +98,9 @@ public void run() {
     }
   };
 
-  class RemoveThread extends Thread{
-    ReferenceCountMap<AclFeature> referenceCountMap;
-    public RemoveThread(ReferenceCountMap<AclFeature> referenceCountMap){
+  class RemoveThread extends Thread {
+    private ReferenceCountMap<AclFeature> referenceCountMap;
+    RemoveThread(ReferenceCountMap<AclFeature> referenceCountMap) {
       this.referenceCountMap = referenceCountMap;
     }
     @Override