From 3ecb6da5756b86aad346f550f53fe3e76063d5b0 Mon Sep 17 00:00:00 2001 From: Janak Amarasena Date: Mon, 24 Apr 2017 16:21:37 +0530 Subject: [PATCH] Remove unwanted code --- .../api/impl/CertificateManagementAdminServiceImpl.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/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 b/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 index 34740e5dff..1380bc8cba 100644 --- a/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 +++ b/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 @@ -294,14 +294,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem if (certificate.getSerial().toLowerCase().contains(PROXY_AUTH_MUTUAL_HEADER)) { certificateResponse = certMgtService.verifySubjectDN(certificate.getPem()); } else { - //janak - X509Certificate clientCertificate; - if(certificate.getCertificate()!=null){ - clientCertificate = certificate.getCertificate(); - }else { - clientCertificate = certMgtService.pemToX509Certificate(certificate.getPem()); - } - + X509Certificate clientCertificate = certMgtService.pemToX509Certificate(certificate.getPem()); if (clientCertificate != null) { certificateResponse = certMgtService.verifyPEMSignature(clientCertificate); }