Skip to content

Commit fbdd3f4

Browse files
committed
fix checkstyle issue
1 parent 87ee585 commit fbdd3f4

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7567,12 +7567,8 @@ private List<Cell> getInternal(Get get, boolean withCoprocessor, long nonceGroup
75677567
if (scan.getLoadColumnFamiliesOnDemandValue() == null) {
75687568
scan.setLoadColumnFamiliesOnDemand(isLoadingCfsOnDemandDefault());
75697569
}
7570-
RegionScanner scanner = null;
7571-
try {
7572-
scanner = getScanner(scan, null, nonceGroup, nonce);
7570+
try (RegionScanner scanner = getScanner(scan, null, nonceGroup, nonce)) {
75737571
scanner.next(results);
7574-
} finally {
7575-
if (scanner != null) scanner.close();
75767572
}
75777573

75787574
// post-get CP hook

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -731,21 +731,23 @@ protected boolean shouldStop(Cell currentRowCell) {
731731
return c > 0 || (c == 0 && !includeStopRow);
732732
}
733733

734+
private void closeInternal() {
735+
if (storeHeap != null) {
736+
storeHeap.close();
737+
storeHeap = null;
738+
}
739+
if (joinedHeap != null) {
740+
joinedHeap.close();
741+
joinedHeap = null;
742+
}
743+
// no need to synchronize here.
744+
scannerReadPoints.remove(this);
745+
this.filterClosed = true;
746+
}
747+
734748
@Override
735749
public synchronized void close() {
736-
TraceUtil.trace(() -> {
737-
if (storeHeap != null) {
738-
storeHeap.close();
739-
storeHeap = null;
740-
}
741-
if (joinedHeap != null) {
742-
joinedHeap.close();
743-
joinedHeap = null;
744-
}
745-
// no need to synchronize here.
746-
scannerReadPoints.remove(this);
747-
this.filterClosed = true;
748-
}, () -> region.createRegionSpan("RegionScanner.close"));
750+
TraceUtil.trace(this::closeInternal, () -> region.createRegionSpan("RegionScanner.close"));
749751
}
750752

751753
@Override

0 commit comments

Comments
 (0)