You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/19 23:03:13 UTC
git commit: updated refs/heads/master to e3407a3
Repository: cloudstack
Updated Branches:
refs/heads/master 870e1898e -> e3407a393
findbugs: encoding using preferred Charset
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3407a39
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3407a39
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3407a39
Branch: refs/heads/master
Commit: e3407a3939a99e0851e0b8bb8572bc830a0e39bc
Parents: 870e189
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jun 19 23:03:05 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 19 23:03:05 2015 +0200
----------------------------------------------------------------------
.../kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3407a39/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java
index 28d647f..04c66d7 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifySshKeysCommandWrapper.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import org.apache.log4j.Logger;
+import com.cloud.utils.StringUtils;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
@@ -73,7 +74,7 @@ public final class LibvirtModifySshKeysCommandWrapper extends CommandWrapper<Mod
if (pubKeyFile.exists()) {
try (FileOutputStream pubkStream = new FileOutputStream(pubKeyFile)) {
- pubkStream.write(command.getPubKey().getBytes());
+ pubkStream.write(command.getPubKey().getBytes(StringUtils.getPreferredCharset()));
} catch (final FileNotFoundException e) {
result = "File" + sshpubkeypath + "is not found:"
+ e.toString();