merge-requests/7/head
hasuniea 9 years ago
commit 5057165c44

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

Loading…
Cancel
Save