From 99fee36f2c65c99d865abe5cfa73b38f4c0d1d6f Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 27 Sep 2016 21:13:00 +0530
Subject: [PATCH] Fixing error when properties is null

---
 .../modules/business-controllers/device.js    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
index 6c7dbcc174..f5d57cacdf 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@@ -49,17 +49,17 @@ deviceModule = function () {
     privateMethods.callBackend = function (url, method) {
         if (constants["HTTP_GET"] == method) {
             return serviceInvokers.XMLHttp.get(url,
-                function (backendResponse) {
-                    var response = {};
-                    response.content = backendResponse.responseText;
-                    if (backendResponse.status == 200) {
-                        response.status = "success";
-                    } else if (backendResponse.status == 400 || backendResponse.status == 401 ||
-                        backendResponse.status == 404 || backendResponse.status == 500) {
-                        response.status = "error";
-                    }
-                    return response;
-                }
+                                               function (backendResponse) {
+                                                   var response = {};
+                                                   response.content = backendResponse.responseText;
+                                                   if (backendResponse.status == 200) {
+                                                       response.status = "success";
+                                                   } else if (backendResponse.status == 400 || backendResponse.status == 401 ||
+                                                              backendResponse.status == 404 || backendResponse.status == 500) {
+                                                       response.status = "error";
+                                                   }
+                                                   return response;
+                                               }
             );
         } else {
             log.error("Runtime error : This method only support HTTP GET requests.");
@@ -254,9 +254,11 @@ deviceModule = function () {
                         var device = parse(backendResponse.responseText);
                         var propertiesList = device["properties"];
                         var properties = {};
-                        for (var i = 0; i < propertiesList.length; i++) {
-                            properties[propertiesList[i]["name"]] =
-                                propertiesList[i]["value"];
+                        if (propertiesList) {
+                            for (var i = 0; i < propertiesList.length; i++) {
+                                properties[propertiesList[i]["name"]] =
+                                    propertiesList[i]["value"];
+                            }
                         }
                         var deviceObject = {};
                         deviceObject[constants["DEVICE_IDENTIFIER"]] = device["deviceIdentifier"];
@@ -356,7 +358,7 @@ deviceModule = function () {
 
     publicMethods.getDevices = function (userName) {
         var url = devicemgtProps["httpsURL"] +
-            devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/devices/user/" + userName;
+                  devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/devices/user/" + userName;
         return serviceInvokers.XMLHttp.get(
             url, function (responsePayload) {
                 for (var i = 0; i < responsePayload.length; i++) {