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

changes to removeCertificate endpoint, fix for the jira EMM-1490

Browse Source
This commit is contained in:
madhawap 2016-08-09 11:16:37 +05:30
parent 13126fe398
commit 324e7fd4c6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
View File

@ -122,11 +122,14 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
try { try {
boolean status = certificateService.removeCertificate(serialNumber); boolean status = certificateService.removeCertificate(serialNumber);
if (!status) { if (!status) {
Response.status(Response.Status.NOT_FOUND).entity("No certificate is found with the given " + return Response.status(Response.Status.NOT_FOUND).entity(
"serial number '" + serialNumber + "'"); "No certificate is found with the given " +
"serial number '" + serialNumber + "'").build();
} else {
return Response.status(Response.Status.OK).entity(
"Certificate that carries the serial number '" +
serialNumber + "' has been removed").build();
} }
return Response.status(Response.Status.OK).entity("Certificate that carries the serial number '" +
serialNumber + "' has been removed").build();
} catch (CertificateManagementException e) { } catch (CertificateManagementException e) {
String msg = "Error occurred while converting PEM file to X509Certificate"; String msg = "Error occurred while converting PEM file to X509Certificate";
log.error(msg, e); log.error(msg, e);
@ -136,3 +139,6 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
} }
} }
//return Response.status(Response.Status.NOT_FOUND).entity("No certificate is found with the given " +
// "serial number '" + serialNumber + "'");