serialization issue in json/gson
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4ade3fbe Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4ade3fbe Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4ade3fbe Branch: refs/heads/4.4 Commit: 4ade3fbeb4e0f98c35b47f34198aab303b5f3f63 Parents: 8cf67c0 Author: Daan Hoogland <[email protected]> Authored: Tue Dec 30 16:46:32 2014 +0100 Committer: Daan Hoogland <[email protected]> Committed: Mon Jan 5 12:57:09 2015 +0100 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/NicTO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ade3fbe/api/src/com/cloud/agent/api/to/NicTO.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java index 67660c8..70830b6 100644 --- a/api/src/com/cloud/agent/api/to/NicTO.java +++ b/api/src/com/cloud/agent/api/to/NicTO.java @@ -23,7 +23,7 @@ public class NicTO extends NetworkTO { Integer networkRateMbps; Integer networkRateMulticastMbps; boolean defaultNic; - String uuid; + String nicUuid; List<String> nicSecIps; public NicTO() { @@ -60,12 +60,12 @@ public class NicTO extends NetworkTO { @Override public String getUuid() { - return uuid; + return nicUuid; } @Override public void setUuid(String uuid) { - this.uuid = uuid; + this.nicUuid = uuid; } @Override
