From 3f073460870cb4481955dece7f3914df57d3a296 Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Fri, 20 Jan 2012 15:20:23 -0800
Subject: [PATCH] Fix UI interval for add sticky policy

---
 ui/scripts/network.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a78a6adc015..26112649116 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1678,9 +1678,11 @@
                                       
                                       pollAsyncJobResult({
                                         _custom: args._custom,
-                                        complete: function(args) {
+                                        complete: function(args) {                                          
                                           // Create stickiness policy
-                                          if (stickyData && stickyData.methodname != 'none') {
+                                          if (stickyData &&
+                                              stickyData.methodname &&
+                                              stickyData.methodname != 'none') {
                                             var stickyURLData = '';
                                             var stickyParams;
 
@@ -1721,16 +1723,21 @@
                                                       jobId: json.createLBStickinessPolicy.jobid,
                                                     },
                                                     complete: function(args) {
-                                                      clearInterval(addStickyCheck);
                                                       complete();
+                                                      clearInterval(addStickyCheck);
                                                     },
                                                     error: function(args) {
+                                                      complete();
+                                                      cloudStack.dialog.notice({ message: args.message });
                                                       clearInterval(addStickyCheck);
                                                     }
                                                   });                                                  
                                                 }, 1000);
                                               },
-                                              error: error
+                                              error: function(json) {
+                                                complete();
+                                                cloudStack.dialog.notice({ message: parseXMLHttpResponse(json) });
+                                              }
                                             });
                                           } else {
                                             complete();