Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpecte…

…d client job down. (#4048)" This reverts commit 087bb13.
apache · Jan 26, 2022 · 0ca2307 · 0ca2307
1 parent d8085b4
commit 0ca2307
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -913,19 +913,16 @@ public CellScanner cellScanner() {
 
   @Override
   public Cell current() {
-    if (isEmpty()
+    if (cells == null
             || cellScannerIndex == INITIAL_CELLSCANNER_INDEX
-            || cellScannerIndex >= cells.length) {
+            || cellScannerIndex >= cells.length)
       return null;
-    }
     return this.cells[cellScannerIndex];
   }
 
   @Override
   public boolean advance() {
-    if (isEmpty()) {
-      return false;
-    }
+    if (cells == null) return false;
     cellScannerIndex++;
     if (cellScannerIndex < this.cells.length) {
       return true;