Attachment 859904 Details for Bug 1061954 – patch to correct null pointer xmlrpc faults

[patch] patch to correct null pointer xmlrpc faults

0001-patch-to-handle-systems-registered-with-the-nohardwa.patch (text/plain), 1.90 KB, created by Shannon Hughes on 2014-02-05 22:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shannon Hughes

Created: 2014-02-05 22:49:31 UTC

Size: 1.90 KB

patch

obsolete

>From 49787dbff8767e558aae4a7ffa5e864f1c06a875 Mon Sep 17 00:00:00 2001
>From: Shannon Hughes <shughes@redhat.com>
>Date: Wed, 5 Feb 2014 17:39:55 -0500
>Subject: [PATCH] patch to handle systems registered with the --nohardware
> flag
>
>---
> .../rhn/frontend/xmlrpc/system/SystemHandler.java  |   22 ++++++++++++++++---
> 1 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
>index d437a0b..8e27f61 100644
>--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
>+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
>@@ -697,10 +697,24 @@ public class SystemHandler extends BaseHandler {
>                 m.put("id", server.getId());
>                 m.put("name", server.getName());
>                 m.put("last_checkin", convertLocalToUtc(server.getLastCheckin()));
>-                m.put("ram", server.getRam());
>-                m.put("swap", server.getSwap());
>-                m.put("cpu_info", server.getCpu());
>-                m.put("dmi_info", server.getDmi());
>+
>+                m.put("ram", new Long(server.getRam()));
>+                m.put("swap", new Long(server.getSwap()));
>+
>+                CPU cpu = server.getCpu();
>+                if (cpu == null) {
>+                  m.put("cpu_info", new HashMap<String, String>());
>+                } else {
>+                  m.put("cpu_info", cpu);
>+                }
>+
>+                Dmi dmi = server.getDmi();
>+                if (dmi == null) {
>+                  m.put("dmi_info", new HashMap<String, String>());
>+                } else {
>+                  m.put("dmi_info", dmi);
>+                }
>+
>                 m.put("network_devices",
>                         new ArrayList<NetworkInterface>(server
>                                 .getNetworkInterfaces()));
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 1061954: 859904