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/03/07 20:14:45 UTC
git commit: updated refs/heads/master to d14a994
Repository: cloudstack
Updated Branches:
refs/heads/master ec2639e8f -> d14a99468
findbugs: make use of default charset explicit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d14a9946
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d14a9946
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d14a9946
Branch: refs/heads/master
Commit: d14a994689dcb1ea59d13503f5ec64111c3d684a
Parents: ec2639e
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Sat Mar 7 20:14:24 2015 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Sat Mar 7 20:14:24 2015 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d14a9946/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 a4aa4b6..8d68437 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
@@ -26,6 +26,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -575,7 +576,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
s_logger.debug("Copying VR with ip " + routerIp +" config file into host "+ _host.ip );
try {
- SshHelper.scpTo(_host.ip, 22, _username, null, _password.peek(), hostPath, content.getBytes(), filename, null);
+ SshHelper.scpTo(_host.ip, 22, _username, null, _password.peek(), hostPath, content.getBytes(Charset.defaultCharset()), filename, null);
} catch (Exception e) {
s_logger.warn("scp VR config file into host " + _host.ip + " failed with exception " + e.getMessage().toString());
}