cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 3d48af4
Date Tue, 16 Jun 2015 06:52:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6dbf47675 -> 3d48af41a


Fix findbugs encoding issue in VmwareResource.java Key file should be UTF-8 encoded in VR

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>

This closes #462


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

Branch: refs/heads/master
Commit: 3d48af41a88a7b0572aacb5494848a5492d220dc
Parents: 6dbf476
Author: Rafael da Fonseca <rsafonseca@gmail.com>
Authored: Mon Jun 15 19:40:47 2015 +0200
Committer: Daan Hoogland <daan.hoogland@gmail.com>
Committed: Tue Jun 16 08:51:54 2015 +0200

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d48af41/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 541f748..38b332d 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -705,7 +705,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
         VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
         File keyFile = mgr.getSystemVMKeyFile();
         try {
-            SshHelper.scpTo(routerIp, 3922, "root", keyFile, null, filePath, content.getBytes(),
fileName, null);
+            SshHelper.scpTo(routerIp, 3922, "root", keyFile, null, filePath, content.getBytes("UTF-8"),
fileName, null);
         } catch (Exception e) {
             s_logger.warn("Fail to create file " + filePath + fileName + " in VR " + routerIp,
e);
             return new ExecutionResult(false, e.getMessage());


Mime
View raw message