opendev/gerrit
Code Issues Proposed changes

TreeWalk.release() only release reader, so remove it

Browse Source 
The code releases TreeWalk. This is not nesessary as the TreeWalk.release()
only releases reader object. This is already done in RevWalk.release()
method.

Change-Id: I934ca374461d242ea999ccff8f46f00d6da7c411
This commit is contained in:
David Ostrovsky
2014-08-08 20:33:39 +02:00
parent ba6b574395
commit 1652ede505
3 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java
View File

@@ -112,29 +112,25 @@ class ListDashboards implements RestReadView<ProjectResource> {
throws IOException {
List<DashboardInfo> list = Lists.newArrayList();
TreeWalk tw = new TreeWalk(rw.getObjectReader());
try {
tw.addTree(rw.parseTree(ref.getObjectId()));
tw.setRecursive(true);
while (tw.next()) {
if (tw.getFileMode(0) == FileMode.REGULAR_FILE) {
try {
list.add(DashboardsCollection.parse(
definingProject,
ref.getName().substring(REFS_DASHBOARDS.length()),
tw.getPathString(),
new BlobBasedConfig(null, git, tw.getObjectId(0)),
project,
setDefault));
} catch (ConfigInvalidException e) {
log.warn(String.format(
"Cannot parse dashboard %s:%s:%s: %s",
definingProject.getName(), ref.getName(), tw.getPathString(),
e.getMessage()));
}
tw.addTree(rw.parseTree(ref.getObjectId()));
tw.setRecursive(true);
while (tw.next()) {
if (tw.getFileMode(0) == FileMode.REGULAR_FILE) {
try {
list.add(DashboardsCollection.parse(
definingProject,
ref.getName().substring(REFS_DASHBOARDS.length()),
tw.getPathString(),
new BlobBasedConfig(null, git, tw.getObjectId(0)),
project,
setDefault));
} catch (ConfigInvalidException e) {
log.warn(String.format(
"Cannot parse dashboard %s:%s:%s: %s",
definingProject.getName(), ref.getName(), tw.getPathString(),
e.getMessage()));
}
}
} finally {
tw.release();
}
return list;
}