mirror of
https://github.com/OpenHFT/Chronicle-Map.git
synced 2021-09-13 01:26:12 +00:00
Merge remote-tracking branch 'origin/2.1' into 2.1
This commit is contained in:
@@ -2569,8 +2569,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
|
||||
throw new NoSuchElementException();
|
||||
final Segment segment = segments[segIndex];
|
||||
ThreadLocalCopies copies = SegmentState.getCopies(null);
|
||||
SegmentState segmentState = SegmentState.get(copies);
|
||||
try {
|
||||
try (SegmentState segmentState = SegmentState.get(copies)) {
|
||||
try {
|
||||
segment.readLock(null);
|
||||
} catch (InterruptedException e) {
|
||||
@@ -2584,7 +2583,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
|
||||
advance(returnedSeg = segIndex, returnedPos = pos);
|
||||
return returnedEntry = segment.getEntry(segmentState, pos);
|
||||
} finally {
|
||||
segmentState.close();
|
||||
segment.readUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user