From 4f61396c6144ccadc20e2a7e5d3db2b708533f41 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Tue, 17 Sep 2013 16:30:25 -0700
Subject: [PATCH] CLOUDSTACK-4688: UI > (1) Notifications widget - pollTimer()
 - error handling - check if args is null before trying to access args.message
 property (2) sharedFunctions.js - pollAsyncJobResult() - error handling -
 pass message argument to args.error().

---
 ui/scripts/sharedFunctions.js          | 4 +++-
 ui/scripts/ui/widgets/notifications.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index fdeb7d10b09..b6a1c1fbf77 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -107,7 +107,9 @@ var pollAsyncJobResult = function(args) {
             }
         },
         error: function(XMLHttpResponse) {
-            args.error();
+            args.error({
+            	message: parseXMLHttpResponse(XMLHttpResponse)
+            });
         }
     });
 }
diff --git a/ui/scripts/ui/widgets/notifications.js b/ui/scripts/ui/widgets/notifications.js
index fec64c51b18..9b7fc4cce03 100644
--- a/ui/scripts/ui/widgets/notifications.js
+++ b/ui/scripts/ui/widgets/notifications.js
@@ -111,7 +111,7 @@
                     },
                     incomplete: function(args) {},
                     error: function(args) {
-                        if (args.message) {
+                        if (args && args.message) {
                             cloudStack.dialog.notice({
                                 message: _s(args.message)
                             });