From 80e0e7a4e62fbdd60d3dffa8f825a09b109e8958 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 1 Jun 2011 12:05:17 -0700
Subject: [PATCH] cloudStack - capability doesn't always get returned in
 Firewall object. Do a extra validation before loop through it.

---
 ui/scripts/cloud.core.ipaddress.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index bf7f125791c..24bdc1ebf31 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -1221,23 +1221,27 @@ function ipJsonToDetailsTab() {
 
 function ipFindNetworkServiceByName(pName, networkObj) {    
     if(networkObj == null)
-        return null;
-    for(var i=0; i<networkObj.service.length; i++) {
-        var networkServiceObj = networkObj.service[i];
-        if(networkServiceObj.name == pName)
-            return networkServiceObj;
-    }
+        return null;
+    if(networkObj.service != null) {
+	    for(var i=0; i<networkObj.service.length; i++) {
+	        var networkServiceObj = networkObj.service[i];
+	        if(networkServiceObj.name == pName)
+	            return networkServiceObj;
+	    }
+    }    
     return null;
 }
 
 function ipFindCapabilityByName(pName, networkServiceObj) {  
     if(networkServiceObj == null)
-        return null;  
-    for(var i=0; i<networkServiceObj.capability.length; i++) {
-        var capabilityObj = networkServiceObj.capability[i];
-        if(capabilityObj.name == pName)
-            return capabilityObj;
-    }
+        return null;  
+    if(networkServiceObj.capability != null) {
+	    for(var i=0; i<networkServiceObj.capability.length; i++) {
+	        var capabilityObj = networkServiceObj.capability[i];
+	        if(capabilityObj.name == pName)
+	            return capabilityObj;
+	    }
+    }    
     return null;
 }