Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js

@@ -21,7 +21,7 @@ function onRequest(context) {
     var deviceType = context.uriParams.deviceType;
     var deviceId = request.getParameter("id");
 
-    if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
+    if (deviceType && deviceId) {
         var deviceModule = require("/app/modules/device.js").deviceModule;
         var device = deviceModule.viewDevice(deviceType, deviceId);
 

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.js

@@ -20,12 +20,6 @@ function onRequest(context) {
     var log = new Log("operation.js");
     var operationModule = require("/app/modules/operation.js").operationModule;
     var device = context.unit.params.device;
-    var controlOperations;
+    var controlOperations = operationModule.getControlOperations(device.type);
-    try {
-        controlOperations = operationModule.getControlOperations(device.type);
-    }catch(e){
-        log.error("Control operation loading failed.");
-        controlOperations = null;
-    }
     return {"control_operations": controlOperations, "device": device};
 }