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 branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
This commit is contained in:
hasuniea 2015-11-16 20:01:54 +05:30
commit 5057165c44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
View File

@ -82,8 +82,13 @@ public class OperationManagerImpl implements OperationManager {
} }
} }
try { try {
List<DeviceIdentifier> authorizedDeviceList = DeviceManagementDataHolder.getInstance(). List<DeviceIdentifier> authorizedDeviceList;
getDeviceAccessAuthorizationService().isUserAuthorized(deviceIds).getAuthorizedDevices(); if (operation != null && PolicyOperation.POLICY_OPERATION_CODE.equals(operation.getCode())) {
authorizedDeviceList = deviceIds;
} else {
authorizedDeviceList = DeviceManagementDataHolder.getInstance().
getDeviceAccessAuthorizationService().isUserAuthorized(deviceIds).getAuthorizedDevices();
}
if (authorizedDeviceList.size() > 0) { if (authorizedDeviceList.size() > 0) {
try { try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();