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:04:12 UTC
[1/5] git commit: updated refs/heads/master to 509c83b
Repository: cloudstack
Updated Branches:
refs/heads/master 019f246b3 -> 509c83bc7
Fix findbugs encoding issue This is done by calling HttpMethodBase's getResponseBodyAsString() which properly lookup the specified encoding in the request's Content-Type header This also avoids instantiation of two extra strings on the println() and return statements
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #394
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aeccd8af
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aeccd8af
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aeccd8af
Branch: refs/heads/master
Commit: aeccd8afdf62ac9c089916b19138f565bb090d90
Parents: 019f246
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 22:07:20 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 11:59:09 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeccd8af/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 0057e2e..6481a28 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
@@ -1229,7 +1229,7 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection {
private String sendRequest(String service, String xmlRequest) throws ExecutionException {
HttpClient client = new HttpClient();
- byte[] response = null;
+ String response = null;
PostMethod method = new PostMethod("/xmlIM/" + service);
method.setRequestBody(xmlRequest);
@@ -1241,13 +1241,13 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection {
if (statusCode != HttpStatus.SC_OK) {
throw new Exception("Error code : " + statusCode);
}
- response = method.getResponseBody();
+ response = method.getResponseBodyAsString();
} catch (Exception e) {
System.out.println(e.getMessage());
throw new ExecutionException(e.getMessage());
}
- System.out.println(new String(response));
- return new String(response);
+ System.out.println(response);
+ return response;
}
private Map<String, String> checkResponse(String xmlResponse, String... keys) throws ExecutionException {
[3/5] git commit: updated refs/heads/master to 509c83b
Posted by bh...@apache.org.
Fix another findbugs encoding warning in CitrixResourceBase In this case, using default encoding is desired, since the purpose is to read shell command output, which uses the platform's default encoding. This gets rid of the findbugs warning.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #396
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc6d28fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc6d28fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc6d28fc
Branch: refs/heads/master
Commit: cc6d28fc98de31a18e9e9e64e088d7291daaadb9
Parents: faa38ad
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 22:47:17 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 11:59:48 2015 +0300
----------------------------------------------------------------------
.../cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc6d28fc/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 87b210b..43cdd88 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -5048,10 +5048,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Process p = Runtime.getRuntime().exec(cmd);
BufferedReader stdInput = new BufferedReader(new
- InputStreamReader(p.getInputStream()));
+ InputStreamReader(p.getInputStream(),Charset.defaultCharset()));
BufferedReader stdError = new BufferedReader(new
- InputStreamReader(p.getErrorStream()));
+ InputStreamReader(p.getErrorStream(),Charset.defaultCharset()));
// read the output from the command
while ((s = stdInput.readLine()) != null) {
[5/5] git commit: updated refs/heads/master to 509c83b
Posted by bh...@apache.org.
Fix findbugs encoding warning in JuniperSrxResource All .xml files contain only utf-8/us-ascii compatible characters. If special characters are added to these files in the future, UTF-8 should be used for cross platform compatibility
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #398
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/509c83bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/509c83bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/509c83bc
Branch: refs/heads/master
Commit: 509c83bc746440e9ebc39c6547dd3d1793c21429
Parents: 438c90d
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sat Jun 13 00:53:30 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:03:56 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/network/resource/JuniperSrxResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/509c83bc/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index d89f1e9..d3a3f1b 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -17,7 +17,7 @@
package com.cloud.network.resource;
import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
@@ -191,7 +191,7 @@ public class JuniperSrxResource implements ServerResource {
throw new Exception("Failed to find Juniper SRX XML file: " + filename);
}
- try(FileReader fr = new FileReader(xmlFilePath);
+ try(InputStreamReader fr = new InputStreamReader(new FileInputStream(xmlFilePath),"UTF-8");
BufferedReader br = new BufferedReader(fr);) {
String xml = "";
String line;
[2/5] git commit: updated refs/heads/master to 509c83b
Posted by bh...@apache.org.
Fix findbugs encoding warning in CitrixResourceBase Output of text files should be UTF-8, this is the default for linux, will now always use the same format for every platform
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #395
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/faa38ad4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/faa38ad4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/faa38ad4
Branch: refs/heads/master
Commit: faa38ad41626300b971b86a9b6e8636e0e66f26c
Parents: aeccd8a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 12 22:41:59 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 11:59:38 2015 +0300
----------------------------------------------------------------------
.../cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/faa38ad4/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 5366927..87b210b 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -19,7 +19,8 @@ package com.cloud.hypervisor.xenserver.resource;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
@@ -5024,7 +5025,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (result && content != null && !content.isEmpty()) {
try {
File file = new File(folder+"/"+fileName+".txt");
- FileWriter fw = new FileWriter(file.getAbsoluteFile());
+ OutputStreamWriter fw = new OutputStreamWriter(new FileOutputStream(file.getAbsoluteFile()),"UTF-8");
BufferedWriter bw = new BufferedWriter(fw);
bw.write(content);
bw.close();
[4/5] git commit: updated refs/heads/master to 509c83b
Posted by bh...@apache.org.
Fix findbugs encoding warning in HttpNfcLeaseMO VMWare ovf files are utf-8 encoded. Relying on default encoding in some platforms such as windows would cause erroneous characters from being read on some fields like description, and could also cause the import to fail, depending on the characters.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #397
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/438c90d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/438c90d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/438c90d7
Branch: refs/heads/master
Commit: 438c90d7838ff56d554fe0fccc7f019eff8d6741
Parents: cc6d28f
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sat Jun 13 00:37:36 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:00:02 2015 +0300
----------------------------------------------------------------------
vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/438c90d7/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java
index a46edc0..6e4980c 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java
@@ -121,7 +121,7 @@ public class HttpNfcLeaseMO extends BaseMO {
public static String readOvfContent(String ovfFilePath) throws IOException {
StringBuffer strContent = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(ovfFilePath)));
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(ovfFilePath),"UTF-8"));
String lineStr;
while ((lineStr = in.readLine()) != null) {
strContent.append(lineStr);