community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

fixed comment issues

Browse Source
merge-requests/1/head
ayyoob 8 years ago
parent abacc0ce2a
commit 536d100fd6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

6
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
Unescape View File

@ -122,7 +122,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
} }
return Response.ok().entity(deviceTypeEvent).build(); return Response.ok().entity(deviceTypeEvent).build();
} catch (AxisFault e) { } catch (AxisFault e) {
log.error("failed to retrieve event definitions for tenantDomain:" + tenantDomain, e); log.error("Failed to retrieve event definitions for tenantDomain:" + tenantDomain, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
} catch (RemoteException e) { } catch (RemoteException e) {
log.error("Failed to connect with the remote services:" + tenantDomain, e); log.error("Failed to connect with the remote services:" + tenantDomain, e);
@ -180,7 +180,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
} }
return Response.ok().build(); return Response.ok().build();
} catch (AxisFault e) { } catch (AxisFault e) {
log.error("failed to create event definitions for tenantDomain:" + tenantDomain, e); log.error("Failed to create event definitions for tenantDomain:" + tenantDomain, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
} catch (RemoteException e) { } catch (RemoteException e) {
log.error("Failed to connect with the remote services:" + tenantDomain, e); log.error("Failed to connect with the remote services:" + tenantDomain, e);
@ -267,7 +267,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
} }
return Response.ok().build(); return Response.ok().build();
} catch (AxisFault e) { } catch (AxisFault e) {
log.error("failed to delete event definitions for tenantDomain:" + tenantDomain, e); log.error("Failed to delete event definitions for tenantDomain:" + tenantDomain, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
} catch (RemoteException e) { } catch (RemoteException e) {
log.error("Failed to connect with the remote services:" + tenantDomain, e); log.error("Failed to connect with the remote services:" + tenantDomain, e);

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
Unescape View File

@ -655,12 +655,12 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
try { try {
if (operationRequest == null || operationRequest.getDeviceIdentifiers() == null if (operationRequest == null || operationRequest.getDeviceIdentifiers() == null
|| operationRequest.getOperation() == null) { || operationRequest.getOperation() == null) {
String errorMessage = "Device identifier list is empty"; String errorMessage = "Operation cannot be empty";
log.error(errorMessage); log.error(errorMessage);
return Response.status(Response.Status.BAD_REQUEST).build(); return Response.status(Response.Status.BAD_REQUEST).build();
} }
if (!DeviceMgtAPIUtils.getDeviceManagementService().getAvailableDeviceTypes().contains(type)) { if (!DeviceMgtAPIUtils.getDeviceManagementService().getAvailableDeviceTypes().contains(type)) {
String errorMessage = "Device identifier list is empty"; String errorMessage = "Device Type is invalid";
log.error(errorMessage); log.error(errorMessage);
return Response.status(Response.Status.BAD_REQUEST).build(); return Response.status(Response.Status.BAD_REQUEST).build();
} }

Write Preview
Loading…
Cancel
Save