java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 8
+++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3babf6a5e4a450f25ca8c809842d1dca0a044da0
Author: Mark Huth <mhuth(a)redhat.com>
Date: Fri Nov 1 02:25:10 2013 -0400
BZ1025626 - Prevent NPE with system.getDetails() API call for virtual systems with no
virtualization type
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
index 3473765..9e10a55 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
@@ -178,7 +178,13 @@ public class ServerSerializer extends RhnXmlRpcCustomSerializer {
helper.add("lock_status", locked);
if (server.isVirtualGuest()) {
- helper.add("virtualization",
server.getVirtualInstance().getType().getName());
+ if (server.getVirtualInstance().getType() != null) {
+ helper.add("virtualization",
server.getVirtualInstance().getType().
+ getName());
+ }
+ else {
+ helper.add("virtualization", "");
+ }
}
helper.writeTo(output);
Show replies by date