You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2015/06/29 09:01:04 UTC
[43/50] [abbrv] git commit: updated refs/heads/dhcpoffload to 45721ae
findbugs encoding
fake message part to remove stale PR folowing
This closes #33
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0bf00c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0bf00c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0bf00c5
Branch: refs/heads/dhcpoffload
Commit: c0bf00c568531dc21c409649e9089244b8ff0e78
Parents: 12d5240
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Jun 25 14:43:49 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Jun 25 14:43:49 2015 +0200
----------------------------------------------------------------------
agent/src/com/cloud/agent/resource/DummyResource.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0bf00c5/agent/src/com/cloud/agent/resource/DummyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java
index ea23f96..c0167f6 100644
--- a/agent/src/com/cloud/agent/resource/DummyResource.java
+++ b/agent/src/com/cloud/agent/resource/DummyResource.java
@@ -41,6 +41,7 @@ import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.resource.ServerResource;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.utils.StringUtils;
@Local(value = {ServerResource.class})
public class DummyResource implements ServerResource {
@@ -135,7 +136,7 @@ public class DummyResource implements ServerResource {
String hostIp = getConfiguredProperty("private.ip.address", "127.0.0.1");
String localStoragePath = getConfiguredProperty("local.storage.path", "/mnt");
String lh = hostIp + localStoragePath;
- String uuid = UUID.nameUUIDFromBytes(lh.getBytes()).toString();
+ String uuid = UUID.nameUUIDFromBytes(lh.getBytes(StringUtils.getPreferredCharset())).toString();
String capacity = getConfiguredProperty("local.storage.capacity", "1000000000");
String available = getConfiguredProperty("local.storage.avail", "10000000");