Repository: cloudstack Updated Branches: refs/heads/master 66f516342 -> 22f194b88
coverity 1147049: buffered file reader resource guard Signed-off-by: Daan Hoogland <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/488ee88a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/488ee88a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/488ee88a Branch: refs/heads/master Commit: 488ee88ae8453ad5029758020847aa09f9cd8ebc Parents: 66f5163 Author: Daan Hoogland <[email protected]> Authored: Fri Jul 17 15:36:56 2015 +0200 Committer: Daan Hoogland <[email protected]> Committed: Mon Jul 27 14:43:10 2015 +0200 ---------------------------------------------------------------------- core/src/com/cloud/storage/template/VmdkProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/488ee88a/core/src/com/cloud/storage/template/VmdkProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index 6903b74..929157e 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -86,9 +86,10 @@ public class VmdkProcessor extends AdapterBase implements Processor { long virtualSize = 0; String templateFileFullPath = templatePath.endsWith(File.separator) ? templatePath : templatePath + File.separator; templateFileFullPath += templateName.endsWith(ImageFormat.VMDK.getFileExtension()) ? templateName : templateName + "." + ImageFormat.VMDK.getFileExtension(); - try { - FileReader fileReader = new FileReader(templateFileFullPath); - BufferedReader bufferedReader = new BufferedReader(fileReader); + try ( + FileReader fileReader = new FileReader(templateFileFullPath); + BufferedReader bufferedReader = new BufferedReader(fileReader); + ) { Pattern regex = Pattern.compile("(RW|RDONLY|NOACCESS) (\\d+) (FLAT|SPARSE|ZERO|VMFS|VMFSSPARSE|VMFSDRM|VMFSRAW)"); String line = null; while((line = bufferedReader.readLine()) != null) { @@ -99,7 +100,6 @@ public class VmdkProcessor extends AdapterBase implements Processor { break; } } - bufferedReader.close(); } catch(FileNotFoundException ex) { String msg = "Unable to open file '" + templateFileFullPath + "' " + ex.toString(); s_logger.error(msg);
