From 73a6aa78854f379e6439bf22457094a5272cbfed Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Tue, 9 Jul 2013 17:24:19 -0700 Subject: [PATCH] CLOUDSTACK-3433: Relax the same package restriction for Command and its derived classes in ArrayTypeAdaptor --- core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java index 8eddc0328b7..ac9be933d29 100755 --- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java +++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Map; -import com.cloud.agent.api.Command; import com.cloud.utils.exception.CloudRuntimeException; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -38,9 +37,6 @@ public class ArrayTypeAdaptor implements JsonDeserializer, JsonSerialize protected Gson _gson = null; - - private static final String s_pkg = Command.class.getPackage().getName() + "."; - public ArrayTypeAdaptor() { } @@ -53,7 +49,7 @@ public class ArrayTypeAdaptor implements JsonDeserializer, 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 +67,7 @@ public class ArrayTypeAdaptor implements JsonDeserializer, JsonSerialize JsonObject element = (JsonObject)it.next(); Map.Entry entry = element.entrySet().iterator().next(); - String name = s_pkg + entry.getKey(); + String name = entry.getKey(); Class clazz; try { clazz = Class.forName(name);