From 5fb86ae316d5e6703e2c54075b8d01149ec8e343 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 3 Jun 2015 17:31:19 +0200 Subject: [PATCH] CID 1302976 Scanner in try-with-resource Signed-off-by: Rohit Yadav This closes #352 (cherry picked from commit 3d4d15275340bd9bbec76afb535e4a48371ef421) Signed-off-by: Rohit Yadav --- .../src/org/apache/cloudstack/utils/linux/CPUStat.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java index 38b7e8ef9e6..d8228a4202e 100644 --- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java +++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java @@ -17,12 +17,12 @@ package org.apache.cloudstack.utils.linux; -import org.apache.log4j.Logger; - import java.io.File; import java.io.FileNotFoundException; import java.util.Scanner; +import org.apache.log4j.Logger; + public class CPUStat { private static final Logger s_logger = Logger.getLogger(CPUStat.class); @@ -52,8 +52,9 @@ public class CPUStat { private UptimeStats getUptimeAndCpuIdleTime() { UptimeStats uptime = new UptimeStats(0d, 0d); - try { - String[] stats = new Scanner(new File(_uptimeFile)).useDelimiter("\\Z").next().split("\\s+"); + File f = new File(_uptimeFile); + try (Scanner scanner = new Scanner(f);) { + String[] stats = scanner.useDelimiter("\\Z").next().split("\\s+"); uptime = new UptimeStats(Double.parseDouble(stats[0]), Double.parseDouble(stats[1])); } catch (FileNotFoundException ex) { s_logger.warn("File " + _uptimeFile + " not found:" + ex.toString());