From 68d5c0919ae4410ff47480327f019dbbbf754a58 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Wed, 5 Jan 2011 18:06:48 -0800
Subject: [PATCH] bug 5482: Fixed malformed JSON when an error is returned by
 the API call.  Also fixed the UI to make use of the new JSON object.

---
 .../com/cloud/api/response/ApiResponseSerializer.java    | 2 +-
 ui/scripts/cloud.core.js                                 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index c08f5189c90..ddd899ccc21 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -64,7 +64,7 @@ public class ApiResponseSerializer {
             } else if (result instanceof SuccessResponse) {
             	sb.append("{ \"success\" : \""+((SuccessResponse)result).getSuccess()+"\"} ");
             } else if (result instanceof ExceptionResponse) {
-                sb.append("{\"errorcode\" : \""+((ExceptionResponse)result).getErrorCode() + ", \"errortext\" : \""+ ((ExceptionResponse)result).getErrorText() +"\"} ");
+                sb.append("{\"errorcode\" : "+((ExceptionResponse)result).getErrorCode() + ", \"errortext\" : \""+ ((ExceptionResponse)result).getErrorText() +"\"} ");
             }else {
                 String jsonStr = gson.toJson(result);
                 if ((jsonStr != null) && !"".equals(jsonStr)) {
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 36d6dd59648..bab9483a0a9 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1073,10 +1073,11 @@ function handleErrorInDialog2(errorMsg, $thisDialog) {
 }
 
 function parseXMLHttpResponse(XMLHttpResponse) {
-    var start = XMLHttpResponse.responseText.indexOf("h1") + 3;
-	var end = XMLHttpResponse.responseText.indexOf("</h1");
-	var errorMsg = XMLHttpResponse.responseText.substring(start, end);
-	return fromdb(errorMsg);	
+	var property;
+	var json = jQuery.parseJSON(XMLHttpResponse.responseText);
+    for(property in json) {}
+    var errorObj = json[property];
+	return fromdb(errorObj.errortext);	
 }
 
 function showLeftNavigationBasedOnRole() {