rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins

Browse Source
revert-dabc3590
Harshan Liyanage 8 years ago
parent 6cc3f39dd3 3b867a533d
commit e1afb5bcdc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementServiceImpl.java
Unescape View File

@ -278,7 +278,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
public Response modifyEnrollment(@PathParam("id") String id, @Valid AndroidDevice androidDevice) { public Response modifyEnrollment(@PathParam("id") String id, @Valid AndroidDevice androidDevice) {
Device device; Device device;
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
deviceIdentifier.setId(androidDevice.getDeviceIdentifier()); deviceIdentifier.setId(id);
deviceIdentifier.setType(AndroidConstants.DEVICE_TYPE_ANDROID); deviceIdentifier.setType(AndroidConstants.DEVICE_TYPE_ANDROID);
try { try {
device = AndroidAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier); device = AndroidAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier);
@ -299,8 +299,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
if (device == null) { if (device == null) {
String errorMessage = "The device to be modified doesn't exist."; String errorMessage = "The device to be modified doesn't exist.";
log.error(errorMessage); log.error(errorMessage);
throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException( throw new org.wso2.carbon.mdm.services.android.exception.NotFoundException(
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build()); new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage(errorMessage).build());
} }
if(androidDevice.getEnrolmentInfo() != null){ if(androidDevice.getEnrolmentInfo() != null){
device.setEnrolmentInfo(device.getEnrolmentInfo()); device.setEnrolmentInfo(device.getEnrolmentInfo());

Write Preview
Loading…
Cancel
Save