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:06:56 UTC
[06/13] git commit: updated refs/heads/master to 967da97
Fix 3 findbugs warnings OVF and VMX descriptor files should be written in UTF-8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #404
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00cdd663
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00cdd663
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00cdd663
Branch: refs/heads/master
Commit: 00cdd66351e793323ed72e5c271516604908fe41
Parents: 333d0e2
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:23:13 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:08 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00cdd663/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index ac5b414..ae8e860 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -21,7 +21,7 @@ import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.URLEncoder;
@@ -1523,7 +1523,7 @@ public class VirtualMachineMO extends BaseMO {
String ovfPath = exportDir + File.separator + exportName + ".ovf";
fileNames.add(ovfPath);
- FileWriter out = new FileWriter(ovfPath);
+ OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(ovfPath),"UTF-8");
out.write(ovfCreateDescriptorResult.getOvfDescriptor());
out.close();
@@ -1592,8 +1592,8 @@ public class VirtualMachineMO extends BaseMO {
boolean replaced = false;
try {
- in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmxContent)));
- out = new BufferedWriter(new OutputStreamWriter(bos));
+ in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmxContent),"UTF-8"));
+ out = new BufferedWriter(new OutputStreamWriter(bos,"UTF-8"));
String line;
while ((line = in.readLine()) != null) {
if (line.startsWith("workingDir")) {