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

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
View File

@@ -252,7 +252,6 @@ public class CreateProjectIT extends AbstractDaemonTest {
tw.reset(); tw.reset();
} }
} finally { } finally {
tw.release();
rw.release(); rw.release();
repo.close(); repo.close();
} }

22
gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java
View File

@@ -62,19 +62,15 @@ public class GetContent implements RestReadView<FileResource> {
if (tw == null) { if (tw == null) {
throw new ResourceNotFoundException(); throw new ResourceNotFoundException();
} }
try { final ObjectLoader object = repo.open(tw.getObjectId(0));
final ObjectLoader object = repo.open(tw.getObjectId(0)); @SuppressWarnings("resource")
@SuppressWarnings("resource") BinaryResult result = new BinaryResult() {
BinaryResult result = new BinaryResult() { @Override
@Override public void writeTo(OutputStream os) throws IOException {
public void writeTo(OutputStream os) throws IOException { object.copyTo(os);
object.copyTo(os); }
} };
}; return result.setContentLength(object.getSize()).base64();
return result.setContentLength(object.getSize()).base64();
} finally {
tw.release();
}
} finally { } finally {
rw.release(); rw.release();
} }

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