java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java | 18 ++++------
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 6742bdedf6669d146316da043048ab16f0862ca9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 10 10:18:41 2011 +0200
741476, 743407 - it is the null dmi.getBios() which caused the problem in bug 452956 actually.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
index 7fb29ad..218707f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
@@ -38,9 +38,9 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "product")
* #prop("string", "asset")
* #prop("string", "board")
- * #prop("string", "bios_release")
- * #prop("string", "bios_vendor")
- * #prop("string", "bios_version")
+ * #prop_desc("string", "bios_release", "(optional)")
+ * #prop_desc("string", "bios_vendor", "(optional)")
+ * #prop_desc("string", "bios_version", "(optional)")
* #struct_end()
*/
public class DmiSerializer implements XmlRpcCustomSerializer {
@@ -59,18 +59,16 @@ public class DmiSerializer implements XmlRpcCustomSerializer {
SerializerHelper bean = new SerializerHelper(builtInSerializer);
Dmi dmi = (Dmi) value;
- if (dmi.getSystem() == null) {
- return;
- }
-
bean.add("vendor", StringUtils.defaultString(dmi.getVendor()));
bean.add("system", StringUtils.defaultString(dmi.getSystem()));
bean.add("product", StringUtils.defaultString(dmi.getProduct()));
bean.add("asset", StringUtils.defaultString(dmi.getAsset()));
bean.add("board", StringUtils.defaultString(dmi.getBoard()));
- bean.add("bios_release", StringUtils.defaultString(dmi.getBios().getRelease()));
- bean.add("bios_vendor", StringUtils.defaultString(dmi.getBios().getVendor()));
- bean.add("bios_version", StringUtils.defaultString(dmi.getBios().getVersion()));
+ if (dmi.getBios() != null) {
+ bean.add("bios_release", StringUtils.defaultString(dmi.getBios().getRelease()));
+ bean.add("bios_vendor", StringUtils.defaultString(dmi.getBios().getVendor()));
+ bean.add("bios_version", StringUtils.defaultString(dmi.getBios().getVersion()));
+ }
bean.writeTo(output);
}