cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ko...@apache.org
Subject [5/6] git commit: updated refs/heads/master to c72f65d
Date Sat, 26 Oct 2013 16:30:06 GMT
InputStream use fix in LibvirtComputingResource

- Properties object polulation using PropertiesUtil.loadFromFile

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1783153
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1783153
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1783153

Branch: refs/heads/master
Commit: c17831532e6fad4039b893a771376ef956e21550
Parents: 5847783
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Authored: Thu Oct 24 22:45:43 2013 +0200
Committer: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Committed: Sat Oct 26 17:47:34 2013 +0200

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1783153/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 51ba743..49e3501 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -18,7 +18,6 @@ package com.cloud.hypervisor.kvm.resource;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.BufferedOutputStream;
@@ -436,7 +435,7 @@ ServerResource {
         s_logger.info("developer.properties found at " + file.getAbsolutePath());
         Properties properties = new Properties();
         try {
-            properties.load(new FileInputStream(file));
+            PropertiesUtil.loadFromFile(properties, file);
 
             String startMac = (String) properties.get("private.macaddr.start");
             if (startMac == null) {


Mime
View raw message