From 4db84fb45e1a6dbd4ec1d30a68fcd1ba527f1d5a Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Mon, 6 May 2013 15:11:42 -0700
Subject: [PATCH] Remove the hard-coded package assumption in Command
 serialization.

---
 core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
index 8eddc0328b7..ffb26b6dc84 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);