You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/15 11:08:04 UTC
[1/3] git commit: updated refs/heads/master to ccd7d41
Repository: cloudstack
Updated Branches:
refs/heads/master 967da97f5 -> ccd7d41ee
Add import statements, remove unused FileReader import
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #393
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/980d858c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/980d858c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/980d858c
Branch: refs/heads/master
Commit: 980d858c3466d750cd10b72b94efaf3a1c28e5dd
Parents: 9ad8c70
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 21:47:41 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:07:49 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/980d858c/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
index eeaa610..a362779 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -17,7 +17,8 @@
package com.cloud.network.cisco;
import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashMap;
[3/3] git commit: updated refs/heads/master to ccd7d41
Posted by bh...@apache.org.
Resolve findbugs encoding warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #392
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccd7d41e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccd7d41e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccd7d41e
Branch: refs/heads/master
Commit: ccd7d41ee3bb7ab21dd51517a982993ec245ff72
Parents: 980d858
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 20:58:41 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:07:55 2015 +0300
----------------------------------------------------------------------
.../kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccd7d41e/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/CPUStat.java
----------------------------------------------------------------------
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 d8228a4..ce33850 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
@@ -53,7 +53,7 @@ public class CPUStat {
private UptimeStats getUptimeAndCpuIdleTime() {
UptimeStats uptime = new UptimeStats(0d, 0d);
File f = new File(_uptimeFile);
- try (Scanner scanner = new Scanner(f);) {
+ try (Scanner scanner = new Scanner(f,"UTF-8");) {
String[] stats = scanner.useDelimiter("\\Z").next().split("\\s+");
uptime = new UptimeStats(Double.parseDouble(stats[0]), Double.parseDouble(stats[1]));
} catch (FileNotFoundException ex) {
[2/3] git commit: updated refs/heads/master to ccd7d41
Posted by bh...@apache.org.
Fix findbugs encoding warning, all .xml files contain only utf-8/us-ascii compatible characters
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ad8c70b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ad8c70b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ad8c70b
Branch: refs/heads/master
Commit: 9ad8c70baade7dfaf44be99b77fd7be32ab51539
Parents: 967da97
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 21:39:41 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:07:49 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ad8c70b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
index 6481a28..eeaa610 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -129,7 +129,7 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection {
throw new Exception("Failed to find Cisco VNMC XML file: " + filename);
}
- FileReader fr = new FileReader(xmlFilePath);
+ InputStreamReader fr = new InputStreamReader(new FileInputStream(xmlFilePath),"UTF-8");
BufferedReader br = new BufferedReader(fr);
String xml = "";