opendev/gerrit
Code Issues Proposed changes

Fix a resource leak

Browse Source 
This issue was found by scan.coverity.com (CID 19968)
which is a static code analysis tool, free for open source
code.

Change-Id: I1ec2b191507d80b7fc3101afb9d4925afb570360
This commit is contained in:
Stefan Beller
2015-02-03 10:55:07 -08:00
parent 9fdf1d4738
commit a72ff87673
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/ReviewNoteMerger.java
View File

@@ -43,6 +43,7 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.ObjectStream;
import org.eclipse.jgit.notes.Note;
import org.eclipse.jgit.notes.NoteMerger;
import org.eclipse.jgit.util.io.UnionInputStream;
@@ -67,12 +68,13 @@ class ReviewNoteMerger implements NoteMerger {
ObjectLoader lo = reader.open(ours.getData());
byte[] sep = new byte[] {'\n'};
ObjectLoader lt = reader.open(theirs.getData());
UnionInputStream union = new UnionInputStream(
lo.openStream(),
new ByteArrayInputStream(sep),
lt.openStream());
ObjectId noteData = inserter.insert(Constants.OBJ_BLOB,
lo.getSize() + sep.length + lt.getSize(), union);
return new Note(ours, noteData);
try (ObjectStream os = lo.openStream();
ByteArrayInputStream b = new ByteArrayInputStream(sep);
ObjectStream ts = lt.openStream();
UnionInputStream union = new UnionInputStream(os, b, ts)) {
ObjectId noteData = inserter.insert(Constants.OBJ_BLOB,
lo.getSize() + sep.length + lt.getSize(), union);
return new Note(ours, noteData);
}
}
}