From 342931a53879e39a00eb404193d7a3b5abec65e9 Mon Sep 17 00:00:00 2001 From: "Frank.Zhang" Date: Mon, 21 Oct 2013 14:06:27 -0700 Subject: [PATCH] CLOUDSTACK-4888 API:UCS:NPE Refresh blades on a decommissioned chassis results in NPE --- utils/src/com/cloud/utils/xmlobject/XmlObject.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/src/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/com/cloud/utils/xmlobject/XmlObject.java index 789a74dbb8e..40484f0e1cd 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)e; } - List lst = new ArrayList(1); - lst.add(e); + + List lst = new ArrayList(); + if (e != null) { + lst.add(e); + } return lst; }