Merge pull request #787 from harshanL/master

Added null checks for device cache in-case cache is disabled.

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/cache/impl/DeviceCacheManagerImpl.java

@@ -55,29 +55,35 @@ public class DeviceCacheManagerImpl implements DeviceCacheManager {
     @Override
     public void addDeviceToCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) {
         Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
-        DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
+        if (lCache != null) {
-        if (lCache.containsKey(cacheKey)) {
+            DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
-            this.updateDeviceInCache(deviceIdentifier, device, tenantId);
+            if (lCache.containsKey(cacheKey)) {
-        } else {
+                this.updateDeviceInCache(deviceIdentifier, device, tenantId);
-            lCache.put(cacheKey, device);
+            } else {
+                lCache.put(cacheKey, device);
+            }
         }
     }
 
     @Override
     public void removeDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) {
         Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
-        DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
+        if (lCache != null) {
-        if (lCache.containsKey(cacheKey)) {
+            DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
-            lCache.remove(cacheKey);
+            if (lCache.containsKey(cacheKey)) {
+                lCache.remove(cacheKey);
+            }
         }
     }
 
     @Override
     public void removeDevicesFromCache(List<DeviceCacheKey> deviceList) {
         Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
-        for (DeviceCacheKey cacheKey : deviceList) {
+        if (lCache != null) {
-            if (lCache.containsKey(cacheKey)) {
+            for (DeviceCacheKey cacheKey : deviceList) {
-                lCache.remove(cacheKey);
+                if (lCache.containsKey(cacheKey)) {
+                    lCache.remove(cacheKey);
+                }
             }
         }
     }
@@ -85,16 +91,21 @@ public class DeviceCacheManagerImpl implements DeviceCacheManager {
     @Override
     public void updateDeviceInCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) {
         Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
-        DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
+        if (lCache != null) {
-        if (lCache.containsKey(cacheKey)) {
+            DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
-            lCache.replace(cacheKey, device);
+            if (lCache.containsKey(cacheKey)) {
+                lCache.replace(cacheKey, device);
+            }
         }
     }
 
     @Override
     public Device getDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) {
         Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
-        return lCache.get(getCacheKey(deviceIdentifier, tenantId));
+        if (lCache != null) {
+            return lCache.get(getCacheKey(deviceIdentifier, tenantId));
+        }
+        return null;
     }