torproject/metrics-lib
1
0
Fork 0
mirror of https://github.com/torproject/metrics-lib.git synced 2024-11-23 01:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix leaking resource in TorperfResultImpl.java

Browse Source 
Fix leaking resource in TorperfResultImpl.java using
try-with-resource statement.
This fix is related to analysis on metrics-lib using sonarqube
Implements part of #30544

Signed-off-by: fava <fava@libertymail.net>
This commit is contained in:
fava 2019-08-29 06:52:16 +00:00
parent 9fc82fafb3
commit 114f548674
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java
View File

@ -30,28 +30,31 @@ public class TorperfResultImpl extends DescriptorImpl
List<Descriptor> parsedDescriptors = new ArrayList<>();
String descriptorString = new String(rawDescriptorBytes,
StandardCharsets.UTF_8);
Scanner scanner = new Scanner(descriptorString).useDelimiter("\r?\n");
String typeAnnotation = "";
while (scanner.hasNext()) {
String line = scanner.next();
if (line.startsWith("@type torperf ")) {
String[] parts = line.split(" ");
if (parts.length != 3) {
throw new DescriptorParseException("Illegal line '" + line
+ "'.");
try (Scanner scanner =
new Scanner(descriptorString).useDelimiter("\r?\n")) {
String typeAnnotation = "";
while (scanner.hasNext()) {
String line = scanner.next();
if (line.startsWith("@type torperf ")) {
String[] parts = line.split(" ");
if (parts.length != 3) {
throw new DescriptorParseException("Illegal line '" + line
+ "'.");
}
String version = parts[2];
if (!version.startsWith("1.")) {
throw new DescriptorParseException("Unsupported version in "
+ " line '" + line + "'.");
}
typeAnnotation = line + "\n";
} else {
/* XXX21932 */
parsedDescriptors.add(new TorperfResultImpl(
(typeAnnotation + line + "\n")
.getBytes(StandardCharsets.UTF_8),
descriptorFile));
typeAnnotation = "";
}
String version = parts[2];
if (!version.startsWith("1.")) {
throw new DescriptorParseException("Unsupported version in "
+ " line '" + line + "'.");
}
typeAnnotation = line + "\n";
} else {
/* XXX21932 */
parsedDescriptors.add(new TorperfResultImpl(
(typeAnnotation + line + "\n").getBytes(StandardCharsets.UTF_8),
descriptorFile));
typeAnnotation = "";
}
}
return parsedDescriptors;