Skip to content

HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert #7182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Sep 11, 2024
Merged

HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert #7182

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0d45ba
close DataInputBuffer in a finally clause
len548 Sep 10, 2024
822bb6a
Handle the case where buffer.close() may produce NullPointerException
len548 Sep 10, 2024
a6079ee
Fixed incorrect indentation in finally clause
len548 Sep 10, 2024
b2bc5d4
Used try-with-resources instead of a finally clause.
len548 Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/protocolPB/OMPBHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,13 @@ public static MD5MD5Crc32FileChecksumProto convert(
DataOutputBuffer buf = new DataOutputBuffer();
checksum.write(buf);
byte[] bytes = buf.getData();
DataInputBuffer buffer = new DataInputBuffer();
buffer.reset(bytes, 0, bytes.length);
int bytesPerCRC = buffer.readInt();
long crcPerBlock = buffer.readLong();
buffer.close();
int bytesPerCRC;
long crcPerBlock;
try (DataInputBuffer buffer = new DataInputBuffer()) {
buffer.reset(bytes, 0, bytes.length);
bytesPerCRC = buffer.readInt();
crcPerBlock = buffer.readLong();
}

int offset = Integer.BYTES + Long.BYTES;
ByteString byteString = ByteString.copyFrom(
Expand Down