community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #787 from harshanL/master

Browse Source 
Added null checks for device cache in-case cache is disabled.
This commit is contained in:
Harshan Liyanage 2017-06-19 17:07:35 +05:30 committed by GitHub
commit 1ba90eaa7b
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ public class DeviceCacheManagerImpl implements DeviceCacheManager {
@Override @Override
public void addDeviceToCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) { public void addDeviceToCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) {
Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache(); Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
if (lCache != null) {
DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId); DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
if (lCache.containsKey(cacheKey)) { if (lCache.containsKey(cacheKey)) {
this.updateDeviceInCache(deviceIdentifier, device, tenantId); this.updateDeviceInCache(deviceIdentifier, device, tenantId);
@ -62,40 +63,50 @@ public class DeviceCacheManagerImpl implements DeviceCacheManager {
lCache.put(cacheKey, device); lCache.put(cacheKey, device);
} }
} }
}
@Override @Override
public void removeDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) { public void removeDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) {
Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache(); Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
if (lCache != null) {
DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId); DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
if (lCache.containsKey(cacheKey)) { if (lCache.containsKey(cacheKey)) {
lCache.remove(cacheKey); lCache.remove(cacheKey);
} }
} }
}
@Override @Override
public void removeDevicesFromCache(List<DeviceCacheKey> deviceList) { public void removeDevicesFromCache(List<DeviceCacheKey> deviceList) {
Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache(); Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
if (lCache != null) {
for (DeviceCacheKey cacheKey : deviceList) { for (DeviceCacheKey cacheKey : deviceList) {
if (lCache.containsKey(cacheKey)) { if (lCache.containsKey(cacheKey)) {
lCache.remove(cacheKey); lCache.remove(cacheKey);
} }
} }
} }
}
@Override @Override
public void updateDeviceInCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) { public void updateDeviceInCache(DeviceIdentifier deviceIdentifier, Device device, int tenantId) {
Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache(); Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
if (lCache != null) {
DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId); DeviceCacheKey cacheKey = getCacheKey(deviceIdentifier, tenantId);
if (lCache.containsKey(cacheKey)) { if (lCache.containsKey(cacheKey)) {
lCache.replace(cacheKey, device); lCache.replace(cacheKey, device);
} }
} }
}
@Override @Override
public Device getDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) { public Device getDeviceFromCache(DeviceIdentifier deviceIdentifier, int tenantId) {
Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache(); Cache<DeviceCacheKey, Device> lCache = DeviceManagerUtil.getDeviceCache();
if (lCache != null) {
return lCache.get(getCacheKey(deviceIdentifier, tenantId)); return lCache.get(getCacheKey(deviceIdentifier, tenantId));
} }
return null;
}
private DeviceCacheKey getCacheKey(DeviceIdentifier deviceIdentifier, int tenantId) { private DeviceCacheKey getCacheKey(DeviceIdentifier deviceIdentifier, int tenantId) {