Properties loading simplification - Using the PropertiesUtil methods, the resource handling could be elliminated
Signed-off-by: Laszlo Hornyak <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55c449aa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55c449aa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55c449aa Branch: refs/heads/master Commit: 55c449aa07f39e4d06f96b19f70e6669f6e055bd Parents: b2023d0 Author: Laszlo Hornyak <[email protected]> Authored: Wed Feb 26 22:35:22 2014 +0100 Committer: Laszlo Hornyak <[email protected]> Committed: Sun Nov 23 19:48:56 2014 +0100 ---------------------------------------------------------------------- agent/src/com/cloud/agent/AgentShell.java | 9 +-------- agent/test/com/cloud/agent/AgentShellTest.java | 3 +-- utils/src/com/cloud/utils/PropertiesUtil.java | 3 +-- utils/src/com/cloud/utils/script/Script.java | 1 - 4 files changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55c449aa/agent/src/com/cloud/agent/AgentShell.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index 67b7b2f..34e73ed 100644 --- a/agent/src/com/cloud/agent/AgentShell.java +++ b/agent/src/com/cloud/agent/AgentShell.java @@ -17,10 +17,8 @@ package com.cloud.agent; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -37,7 +35,6 @@ import javax.naming.ConfigurationException; import org.apache.commons.daemon.Daemon; import org.apache.commons.daemon.DaemonContext; import org.apache.commons.daemon.DaemonInitException; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.apache.log4j.xml.DOMConfigurator; @@ -174,16 +171,12 @@ public class AgentShell implements IAgentShell, Daemon { s_logger.info("agent.properties found at " + file.getAbsolutePath()); - InputStream propertiesStream = null; try { - propertiesStream = new FileInputStream(file); - _properties.load(propertiesStream); + PropertiesUtil.loadFromFile(_properties, file); } catch (final FileNotFoundException ex) { throw new CloudRuntimeException("Cannot find the file: " + file.getAbsolutePath(), ex); } catch (final IOException ex) { throw new CloudRuntimeException("IOException in reading " + file.getAbsolutePath(), ex); - } finally { - IOUtils.closeQuietly(propertiesStream); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55c449aa/agent/test/com/cloud/agent/AgentShellTest.java ---------------------------------------------------------------------- diff --git a/agent/test/com/cloud/agent/AgentShellTest.java b/agent/test/com/cloud/agent/AgentShellTest.java index 1f60d87..5baa7bf 100644 --- a/agent/test/com/cloud/agent/AgentShellTest.java +++ b/agent/test/com/cloud/agent/AgentShellTest.java @@ -20,8 +20,7 @@ import java.util.UUID; import javax.naming.ConfigurationException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; public class AgentShellTest { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55c449aa/utils/src/com/cloud/utils/PropertiesUtil.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/PropertiesUtil.java b/utils/src/com/cloud/utils/PropertiesUtil.java index 1375463..fe5a366 100755 --- a/utils/src/com/cloud/utils/PropertiesUtil.java +++ b/utils/src/com/cloud/utils/PropertiesUtil.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; public class PropertiesUtil { @@ -187,5 +186,5 @@ public class PropertiesUtil { loadFromFile(properties, file); return properties; } - + } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55c449aa/utils/src/com/cloud/utils/script/Script.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java index b8a8668..014432e 100755 --- a/utils/src/com/cloud/utils/script/Script.java +++ b/utils/src/com/cloud/utils/script/Script.java @@ -21,7 +21,6 @@ package com.cloud.utils.script; import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter;
