Updated Branches: refs/heads/4.2 2e75e8ced -> 342931a53
CLOUDSTACK-4888 API:UCS:NPE Refresh blades on a decommissioned chassis results in NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/342931a5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/342931a5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/342931a5 Branch: refs/heads/4.2 Commit: 342931a53879e39a00eb404193d7a3b5abec65e9 Parents: 2e75e8c Author: Frank.Zhang <frank.zh...@citrix.com> Authored: Mon Oct 21 14:06:27 2013 -0700 Committer: Frank.Zhang <frank.zh...@citrix.com> Committed: Mon Oct 21 14:06:27 2013 -0700 ---------------------------------------------------------------------- utils/src/com/cloud/utils/xmlobject/XmlObject.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/342931a5/utils/src/com/cloud/utils/xmlobject/XmlObject.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/com/cloud/utils/xmlobject/XmlObject.java index 789a74d..40484f0 100755 --- a/utils/src/com/cloud/utils/xmlobject/XmlObject.java +++ b/utils/src/com/cloud/utils/xmlobject/XmlObject.java @@ -93,8 +93,11 @@ public class XmlObject { if (e instanceof List) { return (List<T>)e; } - List lst = new ArrayList(1); - lst.add(e); + + List lst = new ArrayList(); + if (e != null) { + lst.add(e); + } return lst; }
