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/12 13:57:51 UTC
git commit: updated refs/heads/master to 14d9c82
Repository: cloudstack
Updated Branches:
refs/heads/master 39d51bc02 -> 14d9c8236
findbugs: String to byt[] conversion
decodeBase64() can work on String so the unsafe conversion is not needed
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #361
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14d9c823
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14d9c823
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14d9c823
Branch: refs/heads/master
Commit: 14d9c82369e5f12cab80d06034891b1e665534f9
Parents: 39d51bc
Author: Daan Hoogland <da...@onecht.net>
Authored: Sat Jun 6 10:43:20 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Jun 12 14:57:37 2015 +0300
----------------------------------------------------------------------
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/14d9c823/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 a49da68..84e1d4f 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.getBytes()))});
+ vmData.add(new String[]{"userdata", "user-data", new String(Base64.decodeBase64(userData))});
}
vmData.add(new String[]{"metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering)});
vmData.add(new String[]{"metadata", "availability-zone", StringUtils.unicodeEscape(zoneName)});