From 7eded374b7c7d082c6bd7bce3f719379ffdc2b56 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Mon, 27 Feb 2012 16:06:06 -0800
Subject: [PATCH] bug 13860: add sanity check to ApiResponseSerializer when
 serializing XML response. Reviewed-By: Anthony

---
 .../src/com/cloud/api/response/ApiResponseSerializer.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index fdbbc6b42bd..1c8473eb37b 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -221,7 +221,11 @@ public class ApiResponseSerializer {
                 	String id = (idProxy.getValue() != null ? String.valueOf(idProxy.getValue()) : "");
                 	if(!id.isEmpty()) {
                 		IdentityDao identityDao = new IdentityDaoImpl();
-                		id = identityDao.getIdentityUuid(idProxy.getTableName(), id);
+                		if(idProxy.getTableName() != null) {
+                		    id = identityDao.getIdentityUuid(idProxy.getTableName(), id);
+                		} else {
+                		    s_logger.warn("IdentityProxy sanity check issue, invalid IdentityProxy table name found in class: " + obj.getClass().getName());
+                		}
                 	}
                 	if(id != null && !id.isEmpty())
                 		sb.append("<" + serializedName.value() + ">" + id + "</" + serializedName.value() + ">");