From 53d5e8af1833b7992b48638b7a63a918adf65aee Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Thu, 2 Oct 2014 14:43:10 -0700
Subject: [PATCH] CLOUDSTACK-7668: UI > When UI is loaded the first time,
 sometimes a blank screen instead of a login screen shows. Only after clicking
 Refresh button(i.e. loaded again) will the login screen show.

---
 ui/scripts/cloudStack.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index a2e4dc2b265..ea6fc164a8c 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -496,8 +496,9 @@
         }
         
         //added for dictionary split up
-        
-        $.extend(dictionary,dictionary2);
+        if (dictionary != undefined && dictionary2 != undefined) {
+            $.extend(dictionary,dictionary2);
+        }
 
         // Localize validation messages
         cloudStack.localizeValidatorMessages();