Remove the hard-coded package assumption in Command serialization. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4db84fb4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4db84fb4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4db84fb4
Branch: refs/heads/object_store Commit: 4db84fb45e1a6dbd4ec1d30a68fcd1ba527f1d5a Parents: db65dfb Author: Min Chen <min.c...@citrix.com> Authored: Mon May 6 15:11:42 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Mon May 6 15:11:42 2013 -0700 ---------------------------------------------------------------------- .../cloud/agent/transport/ArrayTypeAdaptor.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4db84fb4/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java index 8eddc03..ffb26b6 100755 --- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java +++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java @@ -39,8 +39,6 @@ public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerialize protected Gson _gson = null; - private static final String s_pkg = Command.class.getPackage().getName() + "."; - public ArrayTypeAdaptor() { } @@ -53,7 +51,7 @@ public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerialize JsonArray array = new JsonArray(); for (T cmd : src) { JsonObject obj = new JsonObject(); - obj.add(cmd.getClass().getName().substring(s_pkg.length()), _gson.toJsonTree(cmd)); + obj.add(cmd.getClass().getName(), _gson.toJsonTree(cmd)); array.add(obj); } @@ -71,7 +69,7 @@ public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerialize JsonObject element = (JsonObject)it.next(); Map.Entry<String, JsonElement> entry = element.entrySet().iterator().next(); - String name = s_pkg + entry.getKey(); + String name = entry.getKey(); Class<?> clazz; try { clazz = Class.forName(name);
