Skip to content

Commit 0af543c

Browse files
committed
Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected client job down. (#4048)"
This reverts commit fbd22f0.
1 parent fbd22f0 commit 0af543c

File tree

1 file changed

+3
-6
lines changed
  • hbase-client/src/main/java/org/apache/hadoop/hbase/client

1 file changed

+3
-6
lines changed

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -913,19 +913,16 @@ public CellScanner cellScanner() {
913913

914914
@Override
915915
public Cell current() {
916-
if (isEmpty()
916+
if (cells == null
917917
|| cellScannerIndex == INITIAL_CELLSCANNER_INDEX
918-
|| cellScannerIndex >= cells.length) {
918+
|| cellScannerIndex >= cells.length)
919919
return null;
920-
}
921920
return this.cells[cellScannerIndex];
922921
}
923922

924923
@Override
925924
public boolean advance() {
926-
if (isEmpty()) {
927-
return false;
928-
}
925+
if (cells == null) return false;
929926
cellScannerIndex++;
930927
if (cellScannerIndex < this.cells.length) {
931928
return true;

0 commit comments

Comments
 (0)