[hbase] branch branch-2.5 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 branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


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

commit 7e8422304d1e9b53d98985d871b386ccbdefbb9c
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Wed Jan 26 13:40:23 2022 +0800

    Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected 
client job down. (#4048)"
    
    This reverts commit 0771c04a32448605def9421750de15fa362de6da.
---
 .../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 138432aa..1ef1633 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;