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 14:20:01 UTC
git commit: updated refs/heads/master to 9d1c38e
Repository: cloudstack
Updated Branches:
refs/heads/master ee3085db4 -> 9d1c38e7e
findbugs: encoding string with preferred Charset
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d1c38e7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d1c38e7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d1c38e7
Branch: refs/heads/master
Commit: 9d1c38e7e74d5074318f1f719feed983e99537f4
Parents: ee3085d
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jun 19 14:19:54 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 19 14:19:54 2015 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d1c38e7/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 84e1d4f..1223696 100644
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -2292,7 +2292,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
final List<String[]> vmData = new ArrayList<String[]>();
if (userData != null) {
- vmData.add(new String[]{"userdata", "user-data", new String(Base64.decodeBase64(userData))});
+ vmData.add(new String[]{"userdata", "user-data", new String(Base64.decodeBase64(userData),StringUtils.getPreferredCharset())});
}
vmData.add(new String[]{"metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering)});
vmData.add(new String[]{"metadata", "availability-zone", StringUtils.unicodeEscape(zoneName)});