From 1ebc06d7140b7e0580e10854ff8aa11a84cbcb69 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Thu, 10 Dec 2015 21:53:07 +0530
Subject: [PATCH 1/2] Changing the identity version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 13b38b845c..3648c377f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -577,7 +577,7 @@
         <carbon.deployment.version>4.6.0</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>5.0.2</carbon.identity.version>
+        <carbon.identity.version>5.0.3</carbon.identity.version>
 
         <!-- Multi-tenancy -->
         <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>

From 330930ade7bda8aae3b90a78a16a680e1f2dcd65 Mon Sep 17 00:00:00 2001
From: inosh-perera <inoshperera@gmail.com>
Date: Fri, 11 Dec 2015 10:02:55 +0530
Subject: [PATCH 2/2] fixes related to location in iOS - EMM-1048

---
 .../mgt/mobile/util/MobileDeviceManagementUtil.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
index dcb4688b33..edecd3a768 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
@@ -124,8 +124,12 @@ public class MobileDeviceManagementUtil {
 			propertyList.add(getProperty(MOBILE_DEVICE_MODEL, mobileDevice.getModel()));
 			propertyList.add(getProperty(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion()));
 			propertyList.add(getProperty(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor()));
-			propertyList.add(getProperty(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude()));
-			propertyList.add(getProperty(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude()));
+            if(mobileDevice.getLatitude() != null) {
+                propertyList.add(getProperty(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude()));
+            }
+            if(mobileDevice.getLongitude() != null) {
+                propertyList.add(getProperty(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude()));
+            }
 			propertyList.add(getProperty(MOBILE_DEVICE_SERIAL, mobileDevice.getSerial()));
 
 			if (mobileDevice.getDeviceProperties() != null) {