From fb50283fbe7875ce64992e268fb9ad5792e75962 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 3 Jun 2015 17:37:13 +0200 Subject: [PATCH] CID 1302974: Scanner in try-with-resource Signed-off-by: Rohit Yadav This closes #353 (cherry picked from commit 109b6e94d39d7c6db4ff721c4699e42abe47ec5e) Signed-off-by: Rohit Yadav --- .../org/apache/cloudstack/utils/linux/MemStat.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java index 1e3c872c353..1d6a4fc5b40 100644 --- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java +++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java @@ -16,11 +16,10 @@ // under the License. package org.apache.cloudstack.utils.linux; -import java.util.HashMap; -import java.util.Map; - import java.io.File; import java.io.FileNotFoundException; +import java.util.HashMap; +import java.util.Map; import java.util.Scanner; public class MemStat { @@ -29,7 +28,7 @@ public class MemStat { protected final static String CACHE_KEY = "Cached"; protected final static String TOTAL_KEY = "MemTotal"; - private Map _memStats = new HashMap(); + private final Map _memStats = new HashMap(); public MemStat() { } @@ -51,9 +50,9 @@ public class MemStat { } public void refresh() { - try { - Scanner fileScanner = new Scanner(new File(MEMINFO_FILE)); - parseFromScanner(fileScanner); + File f = new File(MEMINFO_FILE); + try (Scanner scanner = new Scanner(f)) { + parseFromScanner(scanner); } catch (FileNotFoundException ex) { throw new RuntimeException("File " + MEMINFO_FILE + " not found:" + ex.toString()); }