opendev/gerrit
Code Issues Proposed changes

VersionedMetaData: Open TreeWalk in try-with-resource

Browse Source 
Change-Id: I7aa07931fd89e5e16e2f5586745921ff0fc0ec8d
This commit is contained in:
David Pursehouse
2018-04-17 11:09:06 +02:00
parent 57a8cdb22a
commit 8f1ff9ace8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
View File

@@ -461,10 +461,11 @@ public abstract class VersionedMetaData {
return new byte[] {};
}
TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree());
if (tw != null) {
ObjectLoader obj = reader.open(tw.getObjectId(0), Constants.OBJ_BLOB);
return obj.getCachedBytes(Integer.MAX_VALUE);
try (TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree())) {
if (tw != null) {
ObjectLoader obj = reader.open(tw.getObjectId(0), Constants.OBJ_BLOB);
return obj.getCachedBytes(Integer.MAX_VALUE);
}
}
return new byte[] {};
}
@@ -474,9 +475,10 @@ public abstract class VersionedMetaData {
return null;
}
TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree());
if (tw != null) {
return tw.getObjectId(0);
try (TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree())) {
if (tw != null) {
return tw.getObjectId(0);
}
}
return null;