[hbase] branch master updated: Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected client job down. (#4048)"

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new c33fa3a  Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to 
unexpected client job down. (#4048)"
c33fa3a is described below

commit c33fa3ab78eab172f1f2fbf53f60afb3dcb1cd1b
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Wed Jan 26 13:39:20 2022 +0800

    Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected 
client job down. (#4048)"
    
    This reverts commit d77ede4a29f415d6755d28a76abeaa39e5d34921.
---
 .../src/main/java/org/apache/hadoop/hbase/client/Result.java     | 9 +++------
 1 file changed, 3 insertions(+), 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
index b6c83f7..bff5033 100644
--- 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 class Result implements CellScannable, 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;